Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 04:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/awelzel/ci-fedora-42'

Browse source 
* origin/topic/awelzel/ci-fedora-42:
  probabilistic/BitVector: Add include <cstdint>
  Bump spicy to fix build with GCC 15.1
  CI: Drop fedora-40
  CI: Add fedora-42

(cherry picked from commit 7583651bec)
This commit is contained in:
Arne Welzel 2025-05-08 13:18:52 +02:00 • committed by Tim Wojtulewicz
parent b7a937372d
commit b377fb1d5a
5 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.cirrus.yml
View file

@ -174,19 +174,19 @@ env:
# Linux EOL timelines: https://linuxlifecycle.com/ # Linux EOL timelines: https://linuxlifecycle.com/
# Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle # 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: fedora41_task:
container: container:
# Fedora 41 EOL: Around Nov 2025 # Fedora 41 EOL: Around Nov 2025
dockerfile: ci/fedora-41/Dockerfile dockerfile: ci/fedora-41/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_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 << : *SKIP_TASK_ON_PR
centosstream9_task: centosstream9_task:

14
CHANGES
View file

@ -1,3 +1,17 @@
7.2.0-4 | 2025-05-19 09:29:01 -0700
* probabilistic/BitVector: Add include <cstdint> (Arne Welzel, Corelight)
(cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd)
* CI: Drop fedora-40 (Arne Welzel, Corelight)
(cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd)
* CI: Add fedora-42 (Arne Welzel, Corelight)
(cherry picked from commit 7583651bec7b4a87d77d756bb3ae963f7b69b1cd)
7.2.0-3 | 2025-05-19 09:26:16 -0700 7.2.0-3 | 2025-05-19 09:26:16 -0700
* Include cstdint header to support uint8_t/uint64_t in GCC 15+ (i2z1) * Include cstdint header to support uint8_t/uint64_t in GCC 15+ (i2z1)

2
VERSION
View file

@ -1 +1 @@
7.2.0-3 7.2.0-4

9
ci/fedora-40/Dockerfile → ci/fedora-42/Dockerfile
View file

@ -1,8 +1,8 @@
FROM fedora:40 FROM fedora:42
# A version field to invalidate Cirrus's build cache when needed, as suggested in # 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 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20241024 ENV DOCKERFILE_VERSION 20250508
RUN dnf -y install \ RUN dnf -y install \
bison \ bison \
@ -10,8 +10,9 @@ RUN dnf -y install \
cmake \ cmake \
cppzmq-devel \ cppzmq-devel \
diffutils \ diffutils \
dnsmasq \ findutils \
flex \ flex \
gawk \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \ git \
@ -22,12 +23,14 @@ RUN dnf -y install \
openssl \ openssl \
openssl-devel \ openssl-devel \
procps-ng \ procps-ng \
python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
sqlite \ sqlite \
swig \ swig \
which \ which \
zlib-devel \ zlib-devel \
crypto-policies-scripts \
&& dnf clean all && rm -rf /var/cache/dnf && dnf clean all && rm -rf /var/cache/dnf
RUN pip3 install websockets junit2html RUN pip3 install websockets junit2html

1
src/probabilistic/BitVector.h
View file

@ -2,6 +2,7 @@
#pragma once #pragma once
#include <cstdint>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <optional> #include <optional>