Merge remote-tracking branch 'origin/topic/johanna/fedora36'

* origin/topic/johanna/fedora36: CI: Add Fedora 36, remove Fedora 34
zeek · Jun 21, 2022 · f8193e7 · f8193e7
2 parents 5b85cd6 + 94e1d57
commit f8193e7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -136,10 +136,10 @@ fedora35_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-fedora34_task:
+fedora36_task:
   container:
-    # Fedora 34 EOL: Around May 2022
-    dockerfile: ci/fedora-34/Dockerfile
+    # Fedora 36 EOL: Around May 2023
+    dockerfile: ci/fedora-36/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 

diff --git a/CHANGES b/CHANGES
@@ -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
 
   * CI: Add OpenSuSE Leap 15.4, fix 15.3 (Johanna Amann, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.1.0-dev.61
+5.1.0-dev.64
diff --git a/ci/fedora-34/Dockerfile → ci/fedora-36/Dockerfile b/ci/fedora-34/Dockerfile → ci/fedora-36/Dockerfile
@@ -1,8 +1,8 @@
-FROM fedora:34
+FROM fedora:36
 
 # 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
-ENV DOCKERFILE_VERSION 20220519
+ENV DOCKERFILE_VERSION 20220614
 
 RUN dnf -y install \
     bison \