diff --git a/.cirrus.yml b/.cirrus.yml index 406efceb4d..50e2923200 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -70,10 +70,10 @@ env: # Linux EOL timelines: https://linuxlifecycle.com/ # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle -fedora30_task: +fedora32_task: container: - # Fedora 30 EOL: Around June 2020 - dockerfile: ci/fedora-30/Dockerfile + # Fedora 32 EOL: Around May 2021 + dockerfile: ci/fedora-32/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE diff --git a/CHANGES b/CHANGES index 83b2d54589..54e2604094 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +3.3.0-dev.279 | 2020-09-21 15:22:45 -0700 + + * CI: Move to Fedora 32 (Christian Kreibich, Corelight) + + Fedora 30 is EOL. + 3.3.0-dev.275 | 2020-09-17 13:39:46 -0700 * GH-1164: Fix incorrect RSTOS0 conn_state determinations diff --git a/VERSION b/VERSION index 76096c349a..af2c085251 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-dev.275 +3.3.0-dev.279 diff --git a/ci/fedora-30/Dockerfile b/ci/fedora-32/Dockerfile similarity index 95% rename from ci/fedora-30/Dockerfile rename to ci/fedora-32/Dockerfile index 5572af01e3..80b833fdb3 100644 --- a/ci/fedora-30/Dockerfile +++ b/ci/fedora-32/Dockerfile @@ -1,24 +1,25 @@ -FROM fedora:30 +FROM fedora:32 RUN yum -y install \ - git \ + bison \ cmake \ - make \ + diffutils \ + findutils \ + flex \ + git \ gcc \ gcc-c++ \ - flex \ - bison \ - swig \ + libpcap-devel \ + make \ openssl \ openssl-devel \ - libpcap-devel \ python3 \ python3-devel \ python3-pip\ - zlib-devel \ sqlite \ - findutils \ + swig \ which \ + zlib-devel \ && yum clean all && rm -rf /var/cache/yum # Many distros adhere to PEP 394's recommendation for `python` = `python2` so