From 20b58233d2bcc46115bdfdb1e33aa3c0f5acac22 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 13 Dec 2023 17:20:44 -0800 Subject: [PATCH 1/6] CI: drop Fedora 37, add Fedora 39 --- .cirrus.yml | 12 ++++++------ ci/{fedora-37 => fedora-39}/Dockerfile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename ci/{fedora-37 => fedora-39}/Dockerfile (88%) diff --git a/.cirrus.yml b/.cirrus.yml index b3719430..bba0dcb1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -63,18 +63,18 @@ clang_tidy_task: << : *UNIX_ENV << : *BRANCH_WHITELIST -fedora38_task: +fedora39_task: container: - # Fedora 38 EOL: Around May 2024 - dockerfile: ci/fedora-38/Dockerfile + # Fedora 39 EOL: Around Nov 2024 + dockerfile: ci/fedora-39/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *UNIX_ENV -fedora37_task: +fedora38_task: container: - # Fedora 37 EOL: Around Dec 2023 - dockerfile: ci/fedora-37/Dockerfile + # Fedora 38 EOL: Around May 2024 + dockerfile: ci/fedora-38/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *UNIX_ENV diff --git a/ci/fedora-37/Dockerfile b/ci/fedora-39/Dockerfile similarity index 88% rename from ci/fedora-37/Dockerfile rename to ci/fedora-39/Dockerfile index 80b480cc..1cabc56b 100644 --- a/ci/fedora-37/Dockerfile +++ b/ci/fedora-39/Dockerfile @@ -1,8 +1,8 @@ -FROM fedora:37 +FROM fedora:39 # 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 20230813 +ENV DOCKERFILE_VERSION 20231213 RUN dnf -y install \ cmake \ From be16f2f4bd575f17fe8cee62a5453dc5560aa79b Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 13 Dec 2023 17:22:20 -0800 Subject: [PATCH 2/6] CI: distro EOL comment tweaks --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index bba0dcb1..76b2d22c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -137,7 +137,7 @@ opensuse_leap_15_5_task: opensuse_leap_15_4_task: container: - # Opensuse Leap 15.4 EOL: ~Nov 2023 + # Opensuse Leap 15.4 EOL: ~Dec 2023 dockerfile: ci/opensuse-leap-15.4/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE From 57a3a651a9869acfd4b63fa9473dd7de652d8cd9 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 13 Dec 2023 17:23:07 -0800 Subject: [PATCH 3/6] CI: FreeBSD 14 is out now, 13 is at 13.2, and 12 is about to EOL. --- .cirrus.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 76b2d22c..bbbb2333 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -196,15 +196,11 @@ macos_monterey_task: # FreeBSD EOL timelines: https://www.freebsd.org/security/#sup freebsd14_task: freebsd_instance: - # We don't support FreeBSD 14 yet, this is a purely informative task - image_family: freebsd-14-0-snap + # FreeBSD 14 EOL: Nov 30 2028 + image_family: freebsd-14-0 cpu: 8 # Not allowed to request less than 8GB for an 8 CPU FreeBSD VM. memory: 8GB - - allow_failures: true - skip_notification: true - prepare_script: ./ci/freebsd/prepare.sh << : *CI_TEMPLATE << : *UNIX_ENV @@ -212,18 +208,7 @@ freebsd14_task: freebsd13_task: freebsd_instance: # FreeBSD 13 EOL: January 31, 2026 - image_family: freebsd-13-1 - cpu: 8 - # Not allowed to request less than 8GB for an 8 CPU FreeBSD VM. - memory: 8GB - prepare_script: ./ci/freebsd/prepare.sh - << : *CI_TEMPLATE - << : *UNIX_ENV - -freebsd12_task: - freebsd_instance: - # FreeBSD 12 EOL: June 30, 2024 - image_family: freebsd-12-2 + image_family: freebsd-13-2 cpu: 8 # Not allowed to request less than 8GB for an 8 CPU FreeBSD VM. memory: 8GB From a81b1e9144a697b1976a979ee3ef12daff8822e1 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 13 Dec 2023 17:23:33 -0800 Subject: [PATCH 4/6] CI: add Ubuntu 23.10 --- .cirrus.yml | 8 ++++++++ ci/ubuntu-23.10/Dockerfile | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 ci/ubuntu-23.10/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index bbbb2333..8c24158e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -151,6 +151,14 @@ opensuse_tumbleweed_task: << : *CI_TEMPLATE << : *UNIX_ENV +ubuntu23_task: + container: + # Ubuntu 23.10 EOL: July 2024 + dockerfile: ci/ubuntu-23.10/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + << : *UNIX_ENV + ubuntu22_task: container: # Ubuntu 22.04 EOL: April 2027 diff --git a/ci/ubuntu-23.10/Dockerfile b/ci/ubuntu-23.10/Dockerfile new file mode 100644 index 00000000..47c16ca6 --- /dev/null +++ b/ci/ubuntu-23.10/Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu:23.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 20231213 + +RUN apt-get update && apt-get -y install \ + cmake \ + g++ \ + git \ + libssl-dev \ + make \ + python3 \ + python3-dev \ + && apt autoclean \ + && rm -rf /var/lib/apt/lists/* From fb74c1bff2f04c2977a9edb144997a77e9b6ffd4 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 13 Dec 2023 17:23:54 -0800 Subject: [PATCH 5/6] CI: drop macOS Monterey, add Sonoma For symmetry with Zeek. --- .cirrus.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8c24158e..6b5146c4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -187,16 +187,16 @@ alpine_task: # Apple doesn't publish official long-term support timelines. # We aim to support both the current and previous macOS release. -macos_ventura_task: +macos_sonoma_task: macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-base:latest + image: ghcr.io/cirruslabs/macos-sonoma-base:latest prepare_script: ./ci/macos/prepare.sh << : *CI_TEMPLATE << : *MACOS_RESOURCES_TEMPLATE -macos_monterey_task: +macos_ventura_task: macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-base:latest + image: ghcr.io/cirruslabs/macos-ventura-base:latest prepare_script: ./ci/macos/prepare.sh << : *CI_TEMPLATE << : *MACOS_RESOURCES_TEMPLATE From 791765837009488e8d81918d7546803481355c3a Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 13 Dec 2023 22:06:47 -0800 Subject: [PATCH 6/6] CI: remove openSUSE Leap 15.4, about to EOL --- .cirrus.yml | 8 -------- ci/opensuse-leap-15.4/Dockerfile | 22 ---------------------- 2 files changed, 30 deletions(-) delete mode 100644 ci/opensuse-leap-15.4/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 6b5146c4..d89c32f8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -135,14 +135,6 @@ opensuse_leap_15_5_task: << : *CI_TEMPLATE << : *UNIX_ENV -opensuse_leap_15_4_task: - container: - # Opensuse Leap 15.4 EOL: ~Dec 2023 - dockerfile: ci/opensuse-leap-15.4/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - << : *UNIX_ENV - opensuse_tumbleweed_task: container: # Opensuse Tumbleweed has no EOL diff --git a/ci/opensuse-leap-15.4/Dockerfile b/ci/opensuse-leap-15.4/Dockerfile deleted file mode 100644 index 819ec392..00000000 --- a/ci/opensuse-leap-15.4/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM opensuse/leap:15.4 - -# 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 20220615 - -RUN zypper in -y \ - cmake \ - gcc \ - gcc-c++ \ - git \ - gzip \ - libopenssl-devel \ - make \ - python39 \ - python39-devel \ - python39-pip \ - tar \ - && rm -rf /var/cache/zypp - -RUN update-alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.9 100 -RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 100