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

CI: Move to Fedora 32

Browse source 
Fedora 30 is EOL. For Fedora 32, we need to add the diffutils RPM to
the installation list, since cmp and diff aren't automatically
available in the base image. (Also, sort the RPMs alphabetically.)
This commit is contained in:
Christian Kreibich 2020-09-17 12:56:28 -07:00
parent 26808ea7d4
commit d772bbafc1
2 changed files with 13 additions and 12 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

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