From: Florian Forster Date: Thu, 21 Dec 2023 13:42:21 +0000 (+0100) Subject: .cirrus.yml: Rename container images. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad312137688461a38949de06fc1b856f7d79f10;p=thirdparty%2Fcollectd.git .cirrus.yml: Rename container images. * bookworm_amd64 → debian12 * mantic_amd64 → ubuntu23.10 * el9_x86_64 → centos9 * fedora_rawhide_x86_64 → fedora_main --- diff --git a/.cirrus.yml b/.cirrus.yml index ab3769109..70969750d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,7 +9,7 @@ env: # release_ready_task: container: - image: collectd/ci:bookworm_amd64 + image: collectd/ci:debian12 lint_script: - /checks/check-bashisms.sh - /checks/check-pod.sh @@ -27,10 +27,10 @@ release_ready_task: debian_default_toolchain_task: matrix: - container: - image: collectd/ci:bookworm_amd64 + image: collectd/ci:debian12 allow_failures: false - container: - image: collectd/ci:mantic_amd64 + image: collectd/ci:ubuntu23.10 allow_failures: false - container: image: collectd/ci:debian_unstable @@ -59,16 +59,20 @@ debian_default_toolchain_task: redhat_default_toolchain_task: matrix: - container: - image: collectd/ci:el9_x86_64 + image: collectd/ci:centos9 allow_failures: false + env: + CONTAINER_IMAGE: centos9 - container: image: collectd/ci:fedora39 allow_failures: false - container: - image: collectd/ci:fedora_rawhide_x86_64 + image: collectd/ci:fedora_main allow_failures: true skip_notifications: true only_if: $CIRRUS_BRANCH == 'main' + env: + CONTAINER_IMAGE: fedora_main configure_script: - ./build.sh - gcc --version @@ -86,7 +90,7 @@ redhat_default_toolchain_task: # Some are expected to fail, others should always pass non_standard_toolchains_task: container: - image: collectd/ci:bookworm_amd64 + image: collectd/ci:debian12 only_if: $CIRRUS_PR == '' matrix: