Merge remote-tracking branch 'origin/topic/timw/ci-ubuntu-24-lts'

* origin/topic/timw/ci-ubuntu-24-lts: CI: Add Ubuntu 24.04 build
zeek · May 17, 2024 · 400a085 · 400a085
2 parents 338ece9 + 15270e2
commit 400a085
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 3 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -64,6 +64,12 @@ opensuse_tumbleweed_task:
   prepare_script: ./ci/opensuse-tumbleweed/prepare.sh
   << : *CI_TEMPLATE
 
+ubuntu24_task:
+  container:
+    # Ubuntu 24.04 EOL: Jun 2029
+    dockerfile: ci/ubuntu-24.04/Dockerfile
+  << : *CI_TEMPLATE
+
 ubuntu22_task:
   container:
     # Ubuntu 22.04 EOL: April 2027

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.50-122 | 2024-05-16 20:56:41 -0700
+
+  * CI: Add Ubuntu 24.04 build (Tim Wojtulewicz, Corelight)
+
 0.50-120 | 2024-04-22 12:53:43 -0700
 
   * Always install zeek-archiver, not optionally like adtrace and rst (Christian Kreibich, Corelight)

diff --git a/README b/README
@@ -1,7 +1,7 @@
 .. -*- mode: rst; -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.50-120
+.. |version| replace:: 0.50-122
 
 =======================
 Zeek Auxiliary Programs

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.50-120
+0.50-122
diff --git a/ci/ubuntu-24.04/Dockerfile b/ci/ubuntu-24.04/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:24.04
+
+# 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 20240510
+
+ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
+
+RUN apt-get update && apt-get -y install \
+    cmake \
+    git \
+    g++ \
+    libpcap-dev \
+    make \
+    python3 \
+    python3-pip \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN pip install --break-system-packages btest
diff --git a/zeek-archiver/zeek-archiver.cc b/zeek-archiver/zeek-archiver.cc
@@ -24,7 +24,7 @@
 #include <vector>
 #include <set>
 
-constexpr auto ZEEK_ARCHIVER_VERSION = "v0.50-120";
+constexpr auto ZEEK_ARCHIVER_VERSION = "v0.50-122";
 
 struct Options {
 	std::string src_dir;