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 2025-05-08 13:18:52 +02:00 committed by Tim Wojtulewicz
parent 1610fe9eaf
commit a233788a69
6 changed files with 32 additions and 11 deletions

View file

@ -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

14
CHANGES
View file

@ -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
* Remove unnecessary check for bind library. (Johanna Amann, Corelight)

View file

@ -1 +1 @@
7.0.7-4
7.0.7-5

View file

@ -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

View file

@ -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

View file

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