Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/christian/ci-fedora-32' into master

Browse source 
* origin/topic/christian/ci-fedora-32:
  CI: Move to Fedora 32
This commit is contained in:
Jon Siwek 2020-09-21 15:22:45 -07:00
commit ba5655fdfa
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.cirrus.yml
View file

@ -70,10 +70,10 @@ 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
fedora30_task: fedora32_task:
container: container:
# Fedora 30 EOL: Around June 2020 # Fedora 32 EOL: Around May 2021
dockerfile: ci/fedora-30/Dockerfile dockerfile: ci/fedora-32/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE

6
CHANGES
View file

@ -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 3.3.0-dev.275 | 2020-09-17 13:39:46 -0700
* GH-1164: Fix incorrect RSTOS0 conn_state determinations * GH-1164: Fix incorrect RSTOS0 conn_state determinations

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.275 3.3.0-dev.279

19
ci/fedora-30/Dockerfile → ci/fedora-32/Dockerfile
View file

@ -1,24 +1,25 @@
FROM fedora:30 FROM fedora:32
RUN yum -y install \ RUN yum -y install \
git \ bison \
cmake \ cmake \
make \ diffutils \
findutils \
flex \
git \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
flex \ libpcap-devel \
bison \ make \
swig \
openssl \ openssl \
openssl-devel \ openssl-devel \
libpcap-devel \
python3 \ python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
zlib-devel \
sqlite \ sqlite \
findutils \ swig \
which \ which \
zlib-devel \
&& yum clean all && rm -rf /var/cache/yum && yum clean all && rm -rf /var/cache/yum
# Many distros adhere to PEP 394's recommendation for `python` = `python2` so # Many distros adhere to PEP 394's recommendation for `python` = `python2` so