From aacc4845437a000954c2db62b8c91500d079b546 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 May 2025 09:34:25 +0200 Subject: [PATCH 1/4] CI: Add fedora-42 This ships with gcc 15.1.1 and Python 3.13.3 --- .cirrus.yml | 7 +++++++ ci/fedora-42/Dockerfile | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ci/fedora-42/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 99f0cafa84..38cad65d2f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -174,6 +174,13 @@ env: # Linux EOL timelines: https://linuxlifecycle.com/ # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle +fedora42_task: + container: + # Fedora 42 EOL: Around May 2026 + dockerfile: ci/fedora-42/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + fedora41_task: container: # Fedora 41 EOL: Around Nov 2025 diff --git a/ci/fedora-42/Dockerfile b/ci/fedora-42/Dockerfile new file mode 100644 index 0000000000..578f168b26 --- /dev/null +++ b/ci/fedora-42/Dockerfile @@ -0,0 +1,36 @@ +FROM fedora:42 + +# 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 20250508 + +RUN dnf -y install \ + bison \ + ccache \ + cmake \ + cppzmq-devel \ + diffutils \ + findutils \ + flex \ + gawk \ + gcc \ + gcc-c++ \ + git \ + jq \ + libpcap-devel \ + make \ + nodejs-devel \ + openssl \ + openssl-devel \ + procps-ng \ + python3 \ + python3-devel \ + python3-pip\ + sqlite \ + swig \ + which \ + zlib-devel \ + crypto-policies-scripts \ + && dnf clean all && rm -rf /var/cache/dnf + +RUN pip3 install websockets junit2html From 368a38a050d6d60c6016061e3904985a032861d1 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 May 2025 09:37:22 +0200 Subject: [PATCH 2/4] CI: Drop fedora-40 Still 3 weeks to go, but not quite seeing why we should support 3 different Fedora releases with Zeek 7.2. --- .cirrus.yml | 7 ------- ci/fedora-40/Dockerfile | 33 --------------------------------- 2 files changed, 40 deletions(-) delete mode 100644 ci/fedora-40/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 38cad65d2f..55c992e3d7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -187,13 +187,6 @@ fedora41_task: dockerfile: ci/fedora-41/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE - -fedora40_task: - container: - # Fedora 40 EOL: Around May 2025 - dockerfile: ci/fedora-40/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR centosstream9_task: diff --git a/ci/fedora-40/Dockerfile b/ci/fedora-40/Dockerfile deleted file mode 100644 index f2615b7007..0000000000 --- a/ci/fedora-40/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM fedora:40 - -# 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 20241024 - -RUN dnf -y install \ - bison \ - ccache \ - cmake \ - cppzmq-devel \ - diffutils \ - dnsmasq \ - flex \ - gcc \ - gcc-c++ \ - git \ - jq \ - libpcap-devel \ - make \ - nodejs-devel \ - openssl \ - openssl-devel \ - procps-ng \ - python3-devel \ - python3-pip\ - sqlite \ - swig \ - which \ - zlib-devel \ - && dnf clean all && rm -rf /var/cache/dnf - -RUN pip3 install websockets junit2html From 43c20f41daea202bf3871430087e2114143a724f Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 May 2025 10:05:36 +0200 Subject: [PATCH 3/4] Bump spicy to fix build with GCC 15.1 --- auxil/spicy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auxil/spicy b/auxil/spicy index e15e0bd959..cb1b9c96ae 160000 --- a/auxil/spicy +++ b/auxil/spicy @@ -1 +1 @@ -Subproject commit e15e0bd959a03d06822ae76b53eef6181daf01a2 +Subproject commit cb1b9c96aeabcdd9850bff95a5edd865af1050d4 From f80abe9d45ef6d60d87a26f2b648d3d3c2446cb6 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 May 2025 10:09:10 +0200 Subject: [PATCH 4/4] probabilistic/BitVector: Add include --- src/probabilistic/BitVector.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/probabilistic/BitVector.h b/src/probabilistic/BitVector.h index 5ddd582e63..e1b5ce35be 100644 --- a/src/probabilistic/BitVector.h +++ b/src/probabilistic/BitVector.h @@ -2,6 +2,7 @@ #pragma once +#include #include #include #include