From 4a373e8482bf3e0b1e5ac8355300ea8de1fba664 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 4 Dec 2024 16:19:40 -0800 Subject: [PATCH 1/3] CI: drop Fedora 39, add 41 --- .cirrus.yml | 14 +++++++------- ci/{fedora-39 => fedora-41}/Dockerfile | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) rename ci/{fedora-39 => fedora-41}/Dockerfile (86%) diff --git a/.cirrus.yml b/.cirrus.yml index 9c82634..fc83d8b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,20 +81,20 @@ env: # Linux EOL timelines: https://linuxlifecycle.com/ # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle -fedora40_task: +fedora41_task: container: - # Fedora 40 EOL: Around May 2025 - dockerfile: ci/fedora-40/Dockerfile + # Fedora 41 EOL: Around Nov 2025 + dockerfile: ci/fedora-41/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE + << : *SKIP_TASK_ON_PR -fedora39_task: +fedora40_task: container: - # Fedora 39 EOL: Around Nov 2024 - dockerfile: ci/fedora-39/Dockerfile + # Fedora 40 EOL: Around May 2025 + dockerfile: ci/fedora-40/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE - << : *SKIP_TASK_ON_PR centosstream9_task: container: diff --git a/ci/fedora-39/Dockerfile b/ci/fedora-41/Dockerfile similarity index 86% rename from ci/fedora-39/Dockerfile rename to ci/fedora-41/Dockerfile index 0beb216..0d0c7af 100644 --- a/ci/fedora-39/Dockerfile +++ b/ci/fedora-41/Dockerfile @@ -1,8 +1,8 @@ -FROM fedora:39 +FROM fedora:41 # 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 20231213 +ENV DOCKERFILE_VERSION 20241204 RUN dnf -y install \ bison \ From e4654a9d11dbd82cb8e998534a5e6c4cf39a09a7 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 4 Dec 2024 16:20:30 -0800 Subject: [PATCH 2/3] CI: bump FreeBSD to 13.4 and 14.1, respectively --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index fc83d8b..65a8b11 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -201,7 +201,7 @@ macos_ventura_task: freebsd14_task: freebsd_instance: # FreeBSD 14 EOL: Nov 30 2028 - image_family: freebsd-14-0 + image_family: freebsd-14-1 << : *FREEBSD_RESOURCES_TEMPLATE prepare_script: ./ci/freebsd/prepare.sh @@ -211,7 +211,7 @@ freebsd14_task: freebsd13_task: freebsd_instance: # FreeBSD 13 EOL: January 31, 2026 - image_family: freebsd-13-3 + image_family: freebsd-13-4 << : *FREEBSD_RESOURCES_TEMPLATE prepare_script: ./ci/freebsd/prepare.sh From dc9697d3034536517bd416431f32fc4bb5b4a43c Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 4 Dec 2024 16:22:40 -0800 Subject: [PATCH 3/3] CI: add Ubuntu 24.10 and actually test 24.04 :-) --- .cirrus.yml | 9 ++++++++- ci/ubuntu-24.10/Dockerfile | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ci/ubuntu-24.10/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 65a8b11..028eddf 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -149,10 +149,17 @@ opensuse_tumbleweed_task: << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR +ubuntu24_10_task: + container: + # Ubuntu 24.10 EOL: 2025-07-30 + dockerfile: ci/ubuntu-24.10/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + ubuntu24_task: container: # Ubuntu 24.04 EOL: Jun 2029 - dockerfile: ci/ubuntu-22.04/Dockerfile + dockerfile: ci/ubuntu-24.04/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE diff --git a/ci/ubuntu-24.10/Dockerfile b/ci/ubuntu-24.10/Dockerfile new file mode 100644 index 0000000..4cc56ec --- /dev/null +++ b/ci/ubuntu-24.10/Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu:24.10 + +ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" + +# 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 20241204 + +RUN apt-get update && apt-get -y install \ + bison \ + cmake \ + flex \ + g++ \ + gcc \ + git \ + make \ + && apt autoclean \ + && rm -rf /var/lib/apt/lists/*