From 46edc829cf02eda6f30e709f21b5e9e043bba5e7 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 14 Mar 2025 18:29:52 -0700
Subject: [PATCH 1/2] CI: Change macOS runner to Sequoia

---
 .cirrus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 59d592be5e..1d01927ddd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -377,12 +377,12 @@ alpine_task:
 # Cirrus only supports the following macos runner currently, selecting
 # anything else automatically upgrades to this one.
 #
-#    ghcr.io/cirruslabs/macos-runner:sonoma
+#    ghcr.io/cirruslabs/macos-runner:sequoia
 #
 # See also: https://cirrus-ci.org/guide/macOS/
-macos_sonoma_task:
+macos_sequoia_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-runner:sonoma
+    image: ghcr.io/cirruslabs/macos-runner:sequoia
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_ENVIRONMENT

From 919176873e0b060afdc4b39f4d0ccf74ce2b4e57 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Mon, 17 Mar 2025 10:46:24 +0100
Subject: [PATCH 2/2] ci/init-external-repo.sh: Use regex to match macos cirrus
 task

---
 ci/init-external-repos.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/init-external-repos.sh b/ci/init-external-repos.sh
index 7f27f582be..eeb693f1f6 100755
--- a/ci/init-external-repos.sh
+++ b/ci/init-external-repos.sh
@@ -51,9 +51,9 @@ if [[ -n "${CIRRUS_CI}" ]] && [[ "${CIRRUS_REPO_OWNER}" == "zeek" ]] && [[ ! -d
 
     banner "Trying to clone zeek-testing-private git repo"
     echo "${ZEEK_TESTING_PRIVATE_SSH_KEY}" >cirrus_key.b64
-    if [ "${CIRRUS_TASK_NAME}" == "macos_ventura" -o "${CIRRUS_TASK_NAME}" == "macos_sonoma" ]; then
-        # The base64 command provided with macOS Ventura/Sonoma requires an argument
-        # to pass the input filename
+    if [[ "${CIRRUS_TASK_NAME}" =~ ^macos_ ]]; then
+        # The base64 command provided with macOS requires an argument
+        # to pass the input filename, while -i elsewhere is "ignore garbage".
         base64 -d -i cirrus_key.b64 >cirrus_key
     else
         base64 -d cirrus_key.b64 >cirrus_key