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/johanna/fedora36'

Browse source 
* origin/topic/johanna/fedora36:
  CI: Add Fedora 36, remove Fedora 34
This commit is contained in:
Tim Wojtulewicz 2022-06-21 12:23:20 -07:00
commit f8193e7ecf
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.cirrus.yml
View file

@ -136,10 +136,10 @@ fedora35_task:
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
fedora34_task: fedora36_task:
container: container:
# Fedora 34 EOL: Around May 2022 # Fedora 36 EOL: Around May 2023
dockerfile: ci/fedora-34/Dockerfile dockerfile: ci/fedora-36/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE

6
CHANGES
View file

@ -1,3 +1,9 @@
5.1.0-dev.64 | 2022-06-21 12:23:20 -0700
* CI: Add Fedora 36, remove Fedora 34 (Johanna Amann, Corelight)
* Update broker submodule to fix put_unique issues from 5.0RC1 (Tim Wojtulewicz, Corelight)
5.1.0-dev.61 | 2022-06-17 09:21:44 -0700 5.1.0-dev.61 | 2022-06-17 09:21:44 -0700
* CI: Add OpenSuSE Leap 15.4, fix 15.3 (Johanna Amann, Corelight) * CI: Add OpenSuSE Leap 15.4, fix 15.3 (Johanna Amann, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.1.0-dev.61 5.1.0-dev.64

4
ci/fedora-34/Dockerfile → ci/fedora-36/Dockerfile
View file

@ -1,8 +1,8 @@
FROM fedora:34 FROM fedora:36
# A version field to invalide Cirrus's build cache when needed, as suggested in # A version field to invalide 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 20220519 ENV DOCKERFILE_VERSION 20220614
RUN dnf -y install \ RUN dnf -y install \
bison \ bison \