From b69db915eda0cf003125492e2f57839cab4b0291 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 28 Nov 2023 14:52:43 +0100 Subject: [PATCH] ci: Bump to Fedora 39, install latest feature release --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- Makefile | 4 ++-- docker/fedora-38.Dockerfile | 10 ++++------ ...ghtly.Dockerfile => fedora-39-nightly.Dockerfile} | 4 ++-- .../{fedora-37.Dockerfile => fedora-39.Dockerfile} | 12 +++++------- 6 files changed, 17 insertions(+), 21 deletions(-) rename docker/{fedora-38-nightly.Dockerfile => fedora-39-nightly.Dockerfile} (90%) rename docker/{fedora-37.Dockerfile => fedora-39.Dockerfile} (76%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 652e5e3..055a863 100644 --- 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 index 5f85dd0..5734d6c 100644 --- 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 index eb2b65a..4b22291 100644 --- 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 index a47d2a5..72c2e37 100644 --- 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 b/docker/fedora-39-nightly.Dockerfile similarity index 90% rename from docker/fedora-38-nightly.Dockerfile rename to docker/fedora-39-nightly.Dockerfile index a2b6727..a9eb0a8 100644 --- a/docker/fedora-38-nightly.Dockerfile +++ b/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 b/docker/fedora-39.Dockerfile similarity index 76% rename from docker/fedora-37.Dockerfile rename to docker/fedora-39.Dockerfile index 343d741..5dcb22d 100644 --- a/docker/fedora-37.Dockerfile +++ b/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