diff --git a/.github/workflows/daily-jobs.yml b/.github/workflows/daily-jobs.yml index 70050d7..2dd6215 100644 --- a/.github/workflows/daily-jobs.yml +++ b/.github/workflows/daily-jobs.yml @@ -15,7 +15,7 @@ jobs: matrix: branch: - - sid_amd64 + - debian_unstable - fedora38_x86_64 - fedora_rawhide_x86_64 @@ -23,7 +23,7 @@ jobs: SLUG: "collectd/ci:${{ matrix.branch }}" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} - name: Build container @@ -32,7 +32,7 @@ jobs: - run: docker inspect "${SLUG}" - run: docker history "${SLUG}" - name: Log into the container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/merge-jobs.yml b/.github/workflows/merge-jobs.yml index 7c83809..4db6027 100644 --- a/.github/workflows/merge-jobs.yml +++ b/.github/workflows/merge-jobs.yml @@ -20,7 +20,7 @@ jobs: - run: docker history "${SLUG:?}" - run: docker images - name: Log into the container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/weekly-jobs.yml b/.github/workflows/weekly-jobs.yml index 4b9f383..22195db 100644 --- a/.github/workflows/weekly-jobs.yml +++ b/.github/workflows/weekly-jobs.yml @@ -39,7 +39,7 @@ jobs: SLUG: "collectd/ci:${{ matrix.branch }}" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} - name: Build container @@ -48,7 +48,7 @@ jobs: - run: docker inspect "${SLUG}" - run: docker history "${SLUG}" - name: Log into the container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/README.md b/README.md index b19c19e..d852db3 100644 --- a/README.md +++ b/README.md @@ -4,29 +4,29 @@ Helper images for building collectd Here is a collection of manifests used to build the Docker images hosted at: -There is one branch per distribution/architecture pair which collectd is tested -against. Common bits are stored in the master branch, and merged into the -distro branches when needed. +There is one branch per distribution/version against which collectd is tested. +Common bits, most notably GitHub Actions, are stored in the main branch, and +merged into the distro branches when needed. Each Dockerfile contains a list of package names (mostly support libraries) to -install, and a list of plugins collectd *master* is expected to build based on +install, and a list of plugins collectd *main* is expected to build based on them. We want to stick to the official repositories, and only install packages found there, to ensure collectd releases integrate smoothly in these distributions. -Travis-CI takes care of building these images and pushing them to -cloud.docker.com. NB: Debian/sid and Fedora/rawhide built are triggered once -per day (as these distributions change constantly). You'll find the build logs -there: +GitHub Actions take care of building these images and pushing them to +`cloud.docker.com`. + +NOTE: Debian unstable ("Sid") and Fedora unstable ("Rawhide") are rebuilt daily +(as these distributions change frequently). The goal is to have the resulting images fit in the collectd project's CI, but -they are free to use for any other case. Only patches related to the CI will be -considered, though. +they are free to use for any other case. -Here's an example of how you could build collectd in an Ubuntu/Xenial -environment: -``` +Here's an example of how you can build collectd on Debian unstable: + +```shell git clone https://github.com/collectd/collectd -docker run -it --rm -v $PWD/collectd:/collectd -w /collectd collectd/ci:xenial_amd64 -./build.sh && ./configure && make && make check +docker run -it --rm -v $PWD/collectd:/collectd -w /collectd collectd/ci:debian_unstable +./build.sh && ./configure && make all check ``` diff --git a/checks/check-built-plugins.sh b/checks/check-built-plugins.sh index 147050d..a0721b1 100755 --- a/checks/check-built-plugins.sh +++ b/checks/check-built-plugins.sh @@ -3,9 +3,16 @@ set -e declare -A want -for p in ${SUPPORTED_PLUGIN_LIST}; do - want["${p}"]=1 -done +if [[ $# -ge 1 ]]; then + for p in $(egrep -v '^ *($|#)' "${1}"); do + want["${p}"]=1 + done +else + echo "No plugins on the command line; using SUPPORTED_PLUGIN_LIST instead." + for p in ${SUPPORTED_PLUGIN_LIST}; do + want["${p}"]=1 + done +fi declare -A got for f in .libs/*.so; do