From 96c1bec1d160abbc353482ed5806d8eaa687b3f4 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 10 May 2024 10:28:19 -0700
Subject: [PATCH 1/2] CI: Add Ubuntu 24.04 build

---
 .cirrus.yml                |  7 +++++++
 ci/ubuntu-24.04/Dockerfile | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 ci/ubuntu-24.04/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index bd59ad6..16ec5d7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -149,6 +149,13 @@ opensuse_tumbleweed_task:
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
 
+ubuntu24_task:
+  container:
+    # Ubuntu 24.04 EOL: Jun 2029
+    dockerfile: ci/ubuntu-22.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 ubuntu22_task:
   container:
     # Ubuntu 22.04 EOL: April 2027
diff --git a/ci/ubuntu-24.04/Dockerfile b/ci/ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..a701dc4
--- /dev/null
+++ b/ci/ubuntu-24.04/Dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
+
+# 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
+
+RUN apt-get update && apt-get -y install \
+    bison \
+    cmake \
+    flex \
+    g++ \
+    gcc \
+    git \
+    make \
+  && apt autoclean \
+  && rm -rf /var/lib/apt/lists/*

From 0b63d848eeae09aa2ce58e712ee483989fa1dab6 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 10 May 2024 10:31:48 -0700
Subject: [PATCH 2/2] CI: Use macOS Sonoma xcode VM to fix problem with missing
 tools

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 16ec5d7..10d2cab 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -184,7 +184,7 @@ alpine_task:
 # We aim to support both the current and previous macOS release.
 macos_sonoma_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-base:latest
+    image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_ENVIRONMENT