diff --git a/.cirrus.yml b/.cirrus.yml index 53f0f59da6..e91b0091b7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -108,13 +108,6 @@ fedora34_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -fedora33_task: - container: - # Fedora 33 EOL: Around November 2022 - dockerfile: ci/fedora-33/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - centosstream8_task: container: # Stream 8 support should be 5 years, so until 2024. but I cannot find a concrete timeline --cpk diff --git a/CHANGES b/CHANGES index db88dac579..1f7ca21c68 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +5.0.0-dev.47 | 2022-01-14 12:22:11 -0700 + + * Remove Fedora 33 from CI. (Johanna Amann, Corelight) + + EOL date was 2021‑11‑30 + 5.0.0-dev.45 | 2022-01-14 12:21:25 -0700 * Have `make dist` cleanup a few more wayward files before tarring (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index d01f5d5d7c..18370cc6b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.0-dev.45 +5.0.0-dev.47 diff --git a/ci/fedora-33/Dockerfile b/ci/fedora-33/Dockerfile deleted file mode 100644 index 5717313760..0000000000 --- a/ci/fedora-33/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM fedora:33 - -RUN dnf -y install \ - bison \ - cmake \ - diffutils \ - findutils \ - flex \ - git \ - gcc \ - gcc-c++ \ - libpcap-devel \ - make \ - openssl-devel \ - python3-devel \ - python3-pip\ - sqlite \ - swig \ - which \ - zlib-devel \ - && dnf clean all && rm -rf /var/cache/dnf - -RUN pip3 install junit2html