From a233788a69168c203e122000208b160a68097f44 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 May 2025 13:18:52 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/topic/awelzel/ci-fedora-42' * origin/topic/awelzel/ci-fedora-42: probabilistic/BitVector: Add include Bump spicy to fix build with GCC 15.1 CI: Drop fedora-40 CI: Add fedora-42 (cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd) --- .cirrus.yml | 12 ++++++------ CHANGES | 14 ++++++++++++++ VERSION | 2 +- ci/{fedora-40 => fedora-41}/Dockerfile | 8 ++++++-- ci/{fedora-39 => fedora-42}/Dockerfile | 6 ++++-- src/probabilistic/BitVector.h | 1 + 6 files changed, 32 insertions(+), 11 deletions(-) rename ci/{fedora-40 => fedora-41}/Dockerfile (81%) rename ci/{fedora-39 => fedora-42}/Dockerfile (87%) diff --git a/.cirrus.yml b/.cirrus.yml index f0d88e4af2..f11e114e24 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -171,17 +171,17 @@ env: # Linux EOL timelines: https://linuxlifecycle.com/ # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle -fedora40_task: +fedora42_task: container: - # Fedora 40 EOL: Around May 2025 - dockerfile: ci/fedora-40/Dockerfile + # Fedora 42 EOL: Around May 2026 + dockerfile: ci/fedora-42/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -fedora39_task: +fedora41_task: container: - # Fedora 39 EOL: Around Nov 2024 - dockerfile: ci/fedora-39/Dockerfile + # Fedora 41 EOL: Around Nov 2025 + dockerfile: ci/fedora-41/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR diff --git a/CHANGES b/CHANGES index 6f3cf1121f..8318ffc966 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +7.0.7-5 | 2025-05-19 09:20:24 -0700 + + * probabilistic/BitVector: Add include (Arne Welzel, Corelight) + + (cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd) + + * CI: Drop fedora-39 and fedora-40 (Arne Welzel, Corelight) + + (cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd) + + * CI: Add fedora-41 and fedora-42 (Arne Welzel, Corelight) + + (cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd) + 7.0.7-4 | 2025-05-19 09:17:52 -0700 * Remove unnecessary check for bind library. (Johanna Amann, Corelight) diff --git a/VERSION b/VERSION index 9f3122683a..2e12fe33de 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.7-4 +7.0.7-5 diff --git a/ci/fedora-40/Dockerfile b/ci/fedora-41/Dockerfile similarity index 81% rename from ci/fedora-40/Dockerfile rename to ci/fedora-41/Dockerfile index f292e11ece..e3d737a562 100644 --- a/ci/fedora-40/Dockerfile +++ b/ci/fedora-41/Dockerfile @@ -1,14 +1,16 @@ -FROM fedora:40 +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 20240617 +ENV DOCKERFILE_VERSION 20250203 RUN dnf -y install \ bison \ ccache \ cmake \ + cppzmq-devel \ diffutils \ + findutils \ flex \ gcc \ gcc-c++ \ @@ -20,12 +22,14 @@ RUN dnf -y install \ 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 diff --git a/ci/fedora-39/Dockerfile b/ci/fedora-42/Dockerfile similarity index 87% rename from ci/fedora-39/Dockerfile rename to ci/fedora-42/Dockerfile index 4daaa89308..0992ee91a7 100644 --- a/ci/fedora-39/Dockerfile +++ b/ci/fedora-42/Dockerfile @@ -1,8 +1,8 @@ -FROM fedora:39 +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 20231208 +ENV DOCKERFILE_VERSION 20250508 RUN dnf -y install \ bison \ @@ -11,6 +11,7 @@ RUN dnf -y install \ diffutils \ findutils \ flex \ + gawk \ gcc \ gcc-c++ \ git \ @@ -28,6 +29,7 @@ RUN dnf -y install \ swig \ which \ zlib-devel \ + crypto-policies-scripts \ && dnf clean all && rm -rf /var/cache/dnf RUN pip3 install websockets junit2html 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