From dff14f87e880753e202c6ed9fd3f11a46bf5989e Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 5 Feb 2025 22:58:26 -0800 Subject: [PATCH 1/2] CI: remove OpenSuSE Leap 15.5, EOL. --- .cirrus.yml | 8 -------- ci/opensuse-leap-15.5/Dockerfile | 22 ---------------------- 2 files changed, 30 deletions(-) delete mode 100644 ci/opensuse-leap-15.5/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index c4099743..0d172a03 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -103,14 +103,6 @@ debian11_task: << : *CI_TEMPLATE << : *UNIX_ENV -opensuse_leap_15_5_task: - container: - # Opensuse Leap 15.5 EOL: ~Dec 2024 - dockerfile: ci/opensuse-leap-15.5/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - << : *UNIX_ENV - opensuse_leap_15_6_task: container: # Opensuse Leap 15.6 EOL: ~Dec 2025 diff --git a/ci/opensuse-leap-15.5/Dockerfile b/ci/opensuse-leap-15.5/Dockerfile deleted file mode 100644 index 6445eb9e..00000000 --- a/ci/opensuse-leap-15.5/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM opensuse/leap:15.5 - -# A version field to invalidate Cirrus's build cache when needed, as suggested in -# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 -ENV DOCKERFILE_VERSION=20230612 - -RUN zypper in -y \ - cmake \ - gcc12 \ - gcc12-c++ \ - git \ - libopenssl-devel \ - make \ - python311 \ - python311-devel \ - && rm -rf /var/cache/zypp - -RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 100 -RUN update-alternatives --install /usr/bin/python3-config python3-config /usr/bin/python3.11-config 100 - -RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-12 100 -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-12 100 From 0b0177c000aeac72946944a5c8734bb0beeebfa1 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 5 Feb 2025 22:58:46 -0800 Subject: [PATCH 2/2] CI: bump FreeBSD 14 to 14.2, which came out in Dec'24 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0d172a03..c7266754 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -178,7 +178,7 @@ macos_sonoma_task: freebsd14_task: freebsd_instance: # FreeBSD 14 EOL: Nov 30 2028 - image_family: freebsd-14-1 + image_family: freebsd-14-2 cpu: 8 # Not allowed to request less than 8GB for an 8 CPU FreeBSD VM. memory: 8GB