Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 07:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CI: drop Fedora 38, add 40

Browse source
This commit is contained in:
Christian Kreibich 2024-05-24 15:04:02 -07:00
parent 8c755af8b2
commit 59d0f311a5
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.cirrus.yml
View file

@ -166,19 +166,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
fedora40_task:
container:
# Fedora 40 EOL: Around May 2025
dockerfile: ci/fedora-40/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
fedora39_task: fedora39_task:
container: container:
# Fedora 39 EOL: Around Nov 2024 # Fedora 39 EOL: Around Nov 2024
dockerfile: ci/fedora-39/Dockerfile dockerfile: ci/fedora-39/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
fedora38_task:
container:
# Fedora 38 EOL: Around May 2024
dockerfile: ci/fedora-38/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR << : *SKIP_TASK_ON_PR
centosstream9_task: centosstream9_task:

6
ci/fedora-38/Dockerfile → ci/fedora-40/Dockerfile
View file

@ -1,15 +1,14 @@
FROM fedora:38 FROM fedora:40
# 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 20230801 ENV DOCKERFILE_VERSION 20240617
RUN dnf -y install \ RUN dnf -y install \
bison \ bison \
ccache \ ccache \
cmake \ cmake \
diffutils \ diffutils \
findutils \
flex \ flex \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
@ -21,7 +20,6 @@ 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 \