From ffb207368188f589ff4167bd33ff270f04752a4b Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 12 Jul 2024 12:00:41 -0700
Subject: [PATCH 1/3] Update cmake submodule [nomail]

---
 cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake b/cmake
index 690483f7..2d42baf8 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 690483f76c149ffa8e035b612b406b0964f9886f
+Subproject commit 2d42baf8e63a7494224aa9d02afa2cb43ddb96b8

From 82ca4673c1421f2b96bc982c1f2f8e6f04a44935 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 12 Jul 2024 12:01:48 -0700
Subject: [PATCH 2/3] CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for
 configure

---
 .cirrus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 10db8ee4..c81cc510 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,8 +2,8 @@
 cpus: &CPUS 8
 memory: &MEMORY 24GB
 
-config: &CONFIG --build-type=release --enable-static
-memcheck_config: &MEMCHECK_CONFIG --build-type=debug --sanitizers=address
+config: &CONFIG --build-type=release --enable-static -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
+memcheck_config: &MEMCHECK_CONFIG --build-type=debug --sanitizers=address -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
 
 resources_template: &RESOURCES_TEMPLATE
   cpu: *CPUS

From 8d9de52dd11227ab23b84022f622e303e865433c Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 12 Jul 2024 12:42:02 -0700
Subject: [PATCH 3/3] CI: Only use Sonoma for macOS

---
 .cirrus.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c81cc510..c46136f4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -161,18 +161,15 @@ alpine_task:
   << : *CI_TEMPLATE
   << : *UNIX_ENV
 
-# Apple doesn't publish official long-term support timelines.
-# We aim to support both the current and previous macOS release.
+# Cirrus only supports the following macos runner currently, selecting
+# anything else automatically upgrades to this one.
+#
+#    ghcr.io/cirruslabs/macos-runner:sonoma
+#
+# See also: https://cirrus-ci.org/guide/macOS/
 macos_sonoma_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-base:latest
-  prepare_script: ./ci/macos/prepare.sh
-  << : *CI_TEMPLATE
-  << : *MACOS_RESOURCES_TEMPLATE
-
-macos_ventura_task:
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-base:latest
+    image: ghcr.io/cirruslabs/macos-runner:sonoma
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_RESOURCES_TEMPLATE