Merge remote-tracking branch 'origin/topic/awelzel/ci-fedora-39'

* origin/topic/awelzel/ci-fedora-39: ci: Bump to Fedora 39, install latest feature release
corelight · Nov 28, 2023 · 6c3f438 · 6c3f438
2 parents d5a9984 + b69db91
commit 6c3f438
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,9 +10,9 @@ jobs:
       matrix:
         distro:
           - ubuntu-2304
-          - fedora-37
           - fedora-38
-          - fedora-38-nightly
+          - fedora-39
+          - fedora-39-nightly
           - debian-bookworm
           - debian-bookworm-lts
     steps:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -10,9 +10,9 @@ jobs:
       matrix:
         distro:
           - ubuntu-2304
-          - fedora-37
           - fedora-38
-          - fedora-38-nightly
+          - fedora-39
+          - fedora-39-nightly
           - debian-bookworm
           - debian-bookworm-lts
     steps:

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ check-clang-tidy: build-it
 
 # Run format, build, tests and clang-tidy within a container.
 check:
-	$(DOCKER) build -t zeekjs-check -f ./docker/fedora-38.Dockerfile .
+	$(DOCKER) build -t zeekjs-check -f ./docker/fedora-39.Dockerfile .
 
 check-nightly:
-	$(DOCKER) build --build-arg STAMP=$(shell date +%Y-%m-%d) -t zeekjs-check-nightly -f ./docker/fedora-38-nightly.Dockerfile .
+	$(DOCKER) build --build-arg STAMP=$(shell date +%Y-%m-%d) -t zeekjs-check-nightly -f ./docker/fedora-39-nightly.Dockerfile .
diff --git a/docker/fedora-38.Dockerfile b/docker/fedora-38.Dockerfile
@@ -10,14 +10,12 @@ RUN dnf install -y \
   which \
   clang-tools-extra
 
-RUN dnf config-manager --add-repo https://download.opensuse.org/repositories/security:zeek/Fedora_37/security:zeek.repo
-
-ENV ZEEK_VERSION='6.1.*'
+RUN dnf config-manager --add-repo https://download.opensuse.org/repositories/security:zeek/Fedora_38/security:zeek.repo
 
 RUN dnf install -y \
-  zeek-btest-$ZEEK_VERSION \
-  zeek-core-$ZEEK_VERSION  \
-  zeek-devel-$ZEEK_VERSION
+  zeek-btest \
+  zeek-core \
+  zeek-devel
 
 ENV PATH=/opt/zeek/bin:$PATH
 

diff --git a/docker/fedora-38-nightly.Dockerfile → docker/fedora-39-nightly.Dockerfile b/docker/fedora-38-nightly.Dockerfile → docker/fedora-39-nightly.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:39
 
 # Dependencies required to compile and test ZeekJS on Fedora
 RUN dnf install -y \
@@ -13,7 +13,7 @@ RUN dnf install -y \
 # Bust the cache
 ARG STAMP=1662210869
 
-RUN dnf config-manager --add-repo https://download.opensuse.org/repositories/security:zeek/Fedora_37/security:zeek.repo
+RUN dnf config-manager --add-repo https://download.opensuse.org/repositories/security:zeek/Fedora_38/security:zeek.repo
 
 RUN dnf install -y \
   zeek-nightly-btest \

diff --git a/docker/fedora-37.Dockerfile → docker/fedora-39.Dockerfile b/docker/fedora-37.Dockerfile → docker/fedora-39.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:39
 
 # Dependencies required to compile and test ZeekJS on Fedora
 RUN dnf install -y \
@@ -10,14 +10,12 @@ RUN dnf install -y \
   which \
   clang-tools-extra
 
-RUN dnf config-manager --add-repo https://download.opensuse.org/repositories/security:zeek/Fedora_37/security:zeek.repo
-
-ENV ZEEK_VERSION='6.1.*'
+RUN dnf config-manager --add-repo https://download.opensuse.org/repositories/security:zeek/Fedora_38/security:zeek.repo
 
 RUN dnf install -y \
-  zeek-btest-$ZEEK_VERSION \
-  zeek-core-$ZEEK_VERSION  \
-  zeek-devel-$ZEEK_VERSION
+  zeek-btest \
+  zeek-core \
+  zeek-devel
 
 ENV PATH=/opt/zeek/bin:$PATH