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/timw/2980-cirrus-updates'

Browse source 
* origin/topic/timw/2980-cirrus-updates:
  CI: Automatically update opensuse-tumbleweed
  CI: Remove Fedora 36, add Fedora 38
This commit is contained in:
Tim Wojtulewicz 2023-04-28 16:33:46 -07:00
commit a7c9454224
7 changed files with 53 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.cirrus.yml
View file

@ -163,19 +163,19 @@ 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
fedora38_task:
container:
# Fedora 38 EOL: Around May 2024
dockerfile: ci/fedora-38/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
fedora37_task: fedora37_task:
container: container:
# Fedora 37 EOL: Around Dec 2024 # Fedora 37 EOL: Around Dec 2024
dockerfile: ci/fedora-37/Dockerfile dockerfile: ci/fedora-37/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
fedora36_task:
container:
# Fedora 36 EOL: Around May 2023
dockerfile: ci/fedora-36/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR << : *SKIP_TASK_ON_PR
centosstream9_task: centosstream9_task:
@ -253,8 +253,9 @@ opensuse_tumbleweed_task:
# Opensuse Tumbleweed has no EOL # Opensuse Tumbleweed has no EOL
dockerfile: ci/opensuse-tumbleweed/Dockerfile dockerfile: ci/opensuse-tumbleweed/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
prepare_script: ./ci/opensuse-tumbleweed/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR # << : *SKIP_TASK_ON_PR
ubuntu2210_task: ubuntu2210_task:
container: container:

6
CHANGES
View file

@ -1,3 +1,9 @@
6.0.0-dev.470 | 2023-04-28 16:33:46 -0700
* CI: Automatically update opensuse-tumbleweed (Tim Wojtulewicz, Corelight)
* CI: Remove Fedora 36, add Fedora 38 (Tim Wojtulewicz, Corelight)
6.0.0-dev.467 | 2023-04-28 10:01:13 +0200 6.0.0-dev.467 | 2023-04-28 10:01:13 +0200
* GH-2791: pcap/Source: Allow more than 32bit for link and dropped stats (Arne Welzel, Corelight) * GH-2791: pcap/Source: Allow more than 32bit for link and dropped stats (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.467 6.0.0-dev.470

32
ci/fedora-38/Dockerfile Normal file
View file

@ -0,0 +1,32 @@
FROM fedora:38
# 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 20230428
RUN dnf -y install \
bison \
ccache \
cmake \
diffutils \
findutils \
flex \
gcc \
gcc-c++ \
git \
libpcap-devel \
make \
nodejs-devel \
openssl \
openssl-devel \
procps-ng \
python3 \
python3-devel \
python3-pip\
sqlite \
swig \
which \
zlib-devel \
&& dnf clean all && rm -rf /var/cache/dnf
RUN pip3 install websockets junit2html

0
ci/fedora-36/Dockerfile → ci/fedora-38/Dockerfile~
View file

2
ci/opensuse-tumbleweed/Dockerfile
View file

@ -2,7 +2,7 @@ FROM opensuse/tumbleweed
# A version field to invalidate Cirrus's build cache when needed, as suggested in # 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 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20230330 ENV DOCKERFILE_VERSION 20230428
RUN zypper refresh \ RUN zypper refresh \
&& zypper in -y \ && zypper in -y \

4
ci/opensuse-tumbleweed/prepare.sh Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
zypper refresh
zypper patch -y --with-update --with-optional