From 368a38a050d6d60c6016061e3904985a032861d1 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 8 May 2025 09:37:22 +0200 Subject: [PATCH] CI: Drop fedora-40 Still 3 weeks to go, but not quite seeing why we should support 3 different Fedora releases with Zeek 7.2. --- .cirrus.yml | 7 ------- ci/fedora-40/Dockerfile | 33 --------------------------------- 2 files changed, 40 deletions(-) delete mode 100644 ci/fedora-40/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 38cad65d2f..55c992e3d7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -187,13 +187,6 @@ fedora41_task: 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: diff --git a/ci/fedora-40/Dockerfile b/ci/fedora-40/Dockerfile deleted file mode 100644 index f2615b7007..0000000000 --- a/ci/fedora-40/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM fedora:40 - -# 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 - -RUN dnf -y install \ - bison \ - ccache \ - cmake \ - cppzmq-devel \ - diffutils \ - dnsmasq \ - flex \ - gcc \ - gcc-c++ \ - git \ - jq \ - libpcap-devel \ - make \ - nodejs-devel \ - openssl \ - openssl-devel \ - procps-ng \ - python3-devel \ - python3-pip\ - sqlite \ - swig \ - which \ - zlib-devel \ - && dnf clean all && rm -rf /var/cache/dnf - -RUN pip3 install websockets junit2html