diff --git a/.cirrus.yml b/.cirrus.yml index 1c25ce170b..7e741c4c72 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -167,19 +167,19 @@ env: # Linux EOL timelines: https://linuxlifecycle.com/ # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle +fedora39_task: + container: + # Fedora 39 EOL: Around Nov 2024 + dockerfile: ci/fedora-39/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + fedora38_task: container: # Fedora 38 EOL: Around May 2024 dockerfile: ci/fedora-38/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE - -fedora37_task: - container: - # Fedora 37 EOL: Around Dec 2024 - dockerfile: ci/fedora-37/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR centosstream9_task: @@ -209,11 +209,30 @@ centos7_task: debian12_task: container: - # Debian 12 (bookworm) EOL: (not yet released) + # Debian 12 (bookworm) EOL: TBD + dockerfile: ci/debian-12/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + +arm_debian12_task: + arm_container: + # Debian 12 (bookworm) EOL: TBD + dockerfile: ci/debian-12/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + env: + ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG + +debian12_static_task: + container: + # Just use a recent/common distro to run a static compile test. + # Debian 12 (bookworm) EOL: TBD dockerfile: ci/debian-12/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR + env: + ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG debian11_task: container: @@ -221,26 +240,7 @@ debian11_task: dockerfile: ci/debian-11/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE - -arm_debian11_task: - arm_container: - # Debian 11 EOL: June 2026 - dockerfile: ci/debian-11/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - env: - ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG - -debian11_static_task: - container: - # Just use a recent/common distro to run a static compile test. - # Debian 11 EOL: June 2026 - dockerfile: ci/debian-11/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR - env: - ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG debian10_task: container: @@ -249,16 +249,6 @@ debian10_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -opensuse_leap_15_4_task: - container: - # Opensuse Leap 15.4 EOL: ~Nov 2023 - dockerfile: ci/opensuse-leap-15.4/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - << : *SKIP_TASK_ON_PR - env: - ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG - opensuse_leap_15_5_task: container: # Opensuse Leap 15.5 EOL: ~Dec 2024 @@ -277,8 +267,8 @@ opensuse_tumbleweed_task: ubuntu23_task: container: - # Ubuntu 23.04 EOL: January 2024 - dockerfile: ci/ubuntu-23.04/Dockerfile + # Ubuntu 23.10 EOL: July 2024 + dockerfile: ci/ubuntu-23.10/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE @@ -368,10 +358,8 @@ macos_ventura_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 - allow_failures: true - skip_notification: true + # FreeBSD 14 EOL: Nov 30 2028 + image_family: freebsd-14-0 << : *FREEBSD_RESOURCES_TEMPLATE prepare_script: ./ci/freebsd/prepare.sh @@ -389,17 +377,6 @@ freebsd13_task: << : *SKIP_TASK_ON_PR << : *FREEBSD_ENVIRONMENT -freebsd12_task: - freebsd_instance: - # FreeBSD 12 EOL: June 30, 2024 - image_family: freebsd-12-2 - << : *FREEBSD_RESOURCES_TEMPLATE - - prepare_script: ./ci/freebsd/prepare.sh - << : *CI_TEMPLATE - << : *SKIP_TASK_ON_PR - << : *FREEBSD_ENVIRONMENT - asan_sanitizer_task: container: # Just uses a recent/common distro to run memory error/leak checks. diff --git a/CHANGES b/CHANGES index f93f5b8309..8c043a3b72 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +6.2.0-dev.287 | 2023-12-14 19:55:28 -0800 + + * CI updates (Christian Kreibich, Corelight) + + - Move Debian variations from 11 to 12 + - Bump Ubuntu 23.04 to 23.10 + - Drop openSUSE Leap 15.4, about to EOL. + - FreeBSD 14 is out now, 12 is about to EOL. + - distro EOL comment tweaks + - drop Fedora 37, add Fedora 39 + 6.2.0-dev.279 | 2023-12-15 00:11:59 +0000 * Update doc submodule [nomail] [skip ci] (zeek-bot) diff --git a/VERSION b/VERSION index d943be7547..4e1dacf415 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.2.0-dev.279 +6.2.0-dev.287 diff --git a/ci/fedora-37/Dockerfile b/ci/fedora-39/Dockerfile similarity index 92% rename from ci/fedora-37/Dockerfile rename to ci/fedora-39/Dockerfile index a5955c5ef4..3b9177415a 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 20230801 +ENV DOCKERFILE_VERSION 20231208 RUN dnf -y install \ bison \ diff --git a/ci/opensuse-leap-15.4/Dockerfile b/ci/opensuse-leap-15.4/Dockerfile deleted file mode 100644 index 8f95ebb085..0000000000 --- a/ci/opensuse-leap-15.4/Dockerfile +++ /dev/null @@ -1,39 +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 20230801 - -RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.4:Update/standard/openSUSE:Leap:15.4:Update.repo \ - && zypper refresh \ - && zypper in -y \ - bison \ - ccache \ - cmake \ - curl \ - flex \ - gcc10 \ - gcc10-c++ \ - git \ - gzip \ - libopenssl-devel \ - libpcap-devel \ - make \ - openssh \ - python39 \ - python39-devel \ - python39-pip \ - swig \ - tar \ - which \ - zlib-devel \ - && 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 -RUN update-alternatives --install /usr/bin/python3-config python3-config /usr/bin/python3.9-config 100 - -RUN pip3 install websockets junit2html - -RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-10 100 -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-10 100 diff --git a/ci/ubuntu-23.04/Dockerfile b/ci/ubuntu-23.10/Dockerfile similarity index 97% rename from ci/ubuntu-23.04/Dockerfile rename to ci/ubuntu-23.10/Dockerfile index b468bb9d23..de278f6f87 100644 --- a/ci/ubuntu-23.04/Dockerfile +++ b/ci/ubuntu-23.10/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:23.04 +FROM ubuntu:23.10 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"