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
This commit is contained in:
commit
7583651bec
6 changed files with 26 additions and 12 deletions
14
.cirrus.yml
14
.cirrus.yml
|
@ -174,19 +174,19 @@ 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
|
||||
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:
|
||||
|
|
10
CHANGES
10
CHANGES
|
@ -1,3 +1,13 @@
|
|||
8.0.0-dev.72 | 2025-05-08 13:18:52 +0200
|
||||
|
||||
* probabilistic/BitVector: Add include <cstdint> (Arne Welzel, Corelight)
|
||||
|
||||
* Bump spicy to fix build with GCC 15.1 (Arne Welzel, Corelight)
|
||||
|
||||
* CI: Drop fedora-40 (Arne Welzel, Corelight)
|
||||
|
||||
* CI: Add fedora-42 (Arne Welzel, Corelight)
|
||||
|
||||
8.0.0-dev.67 | 2025-05-08 09:25:19 +0200
|
||||
|
||||
* Include cstdint header to support uint8_t/uint64_t in GCC 15+ (i2z1)
|
||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
8.0.0-dev.67
|
||||
8.0.0-dev.72
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit e15e0bd959a03d06822ae76b53eef6181daf01a2
|
||||
Subproject commit cb1b9c96aeabcdd9850bff95a5edd865af1050d4
|
|
@ -1,8 +1,8 @@
|
|||
FROM fedora:40
|
||||
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 20241024
|
||||
ENV DOCKERFILE_VERSION 20250508
|
||||
|
||||
RUN dnf -y install \
|
||||
bison \
|
||||
|
@ -10,8 +10,9 @@ RUN dnf -y install \
|
|||
cmake \
|
||||
cppzmq-devel \
|
||||
diffutils \
|
||||
dnsmasq \
|
||||
findutils \
|
||||
flex \
|
||||
gawk \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
git \
|
||||
|
@ -22,12 +23,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
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <iterator>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue