mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Merge remote-tracking branch 'origin/topic/awelzel/ci-fedora-42'
* 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
Tim Wojtulewicz
parent
1610fe9eaf
commit
a233788a69
6 changed files with 32 additions and 11 deletions
12
.cirrus.yml
12
.cirrus.yml
|
|
@ -171,17 +171,17 @@ 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
|
||||||
|
|
||||||
fedora40_task:
|
fedora42_task:
|
||||||
container:
|
container:
|
||||||
# Fedora 40 EOL: Around May 2025
|
# Fedora 42 EOL: Around May 2026
|
||||||
dockerfile: ci/fedora-40/Dockerfile
|
dockerfile: ci/fedora-42/Dockerfile
|
||||||
<< : *RESOURCES_TEMPLATE
|
<< : *RESOURCES_TEMPLATE
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
|
|
||||||
fedora39_task:
|
fedora41_task:
|
||||||
container:
|
container:
|
||||||
# Fedora 39 EOL: Around Nov 2024
|
# Fedora 41 EOL: Around Nov 2025
|
||||||
dockerfile: ci/fedora-39/Dockerfile
|
dockerfile: ci/fedora-41/Dockerfile
|
||||||
<< : *RESOURCES_TEMPLATE
|
<< : *RESOURCES_TEMPLATE
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
<< : *SKIP_TASK_ON_PR
|
<< : *SKIP_TASK_ON_PR
|
||||||
|
|
|
||||||
14
CHANGES
14
CHANGES
|
|
@ -1,3 +1,17 @@
|
||||||
|
7.0.7-5 | 2025-05-19 09:20:24 -0700
|
||||||
|
|
||||||
|
* probabilistic/BitVector: Add include <cstdint> (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
|
7.0.7-4 | 2025-05-19 09:17:52 -0700
|
||||||
|
|
||||||
* Remove unnecessary check for bind library. (Johanna Amann, Corelight)
|
* Remove unnecessary check for bind library. (Johanna Amann, Corelight)
|
||||||
|
|
|
||||||
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
7.0.7-4
|
7.0.7-5
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,16 @@
|
||||||
FROM fedora:40
|
FROM fedora:41
|
||||||
|
|
||||||
# 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 20240617
|
ENV DOCKERFILE_VERSION 20250203
|
||||||
|
|
||||||
RUN dnf -y install \
|
RUN dnf -y install \
|
||||||
bison \
|
bison \
|
||||||
ccache \
|
ccache \
|
||||||
cmake \
|
cmake \
|
||||||
|
cppzmq-devel \
|
||||||
diffutils \
|
diffutils \
|
||||||
|
findutils \
|
||||||
flex \
|
flex \
|
||||||
gcc \
|
gcc \
|
||||||
gcc-c++ \
|
gcc-c++ \
|
||||||
|
|
@ -20,12 +22,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,8 +1,8 @@
|
||||||
FROM fedora:39
|
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 20231208
|
ENV DOCKERFILE_VERSION 20250508
|
||||||
|
|
||||||
RUN dnf -y install \
|
RUN dnf -y install \
|
||||||
bison \
|
bison \
|
||||||
|
|
@ -11,6 +11,7 @@ RUN dnf -y install \
|
||||||
diffutils \
|
diffutils \
|
||||||
findutils \
|
findutils \
|
||||||
flex \
|
flex \
|
||||||
|
gawk \
|
||||||
gcc \
|
gcc \
|
||||||
gcc-c++ \
|
gcc-c++ \
|
||||||
git \
|
git \
|
||||||
|
|
@ -28,6 +29,7 @@ RUN dnf -y install \
|
||||||
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
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue