From 555f705e2db263757c7c6ac580afcaf20c299065 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 16 Dec 2022 08:32:22 -0700
Subject: [PATCH 1/2] CI: drop macOS Big Sur, add macOS Ventura

---
 .cirrus.yml               | 8 ++++----
 ci/init-external-repos.sh | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c94273d0cf..04ac9e33a6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -264,16 +264,16 @@ alpine_task:
 
 # Apple doesn't publish official long-term support timelines.
 # We aim to support both the current and previous macOS release.
-macos_monterey_task:
+macos_ventura_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-base:latest
+    image: ghcr.io/cirruslabs/macos-ventura-base:latest
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_ENVIRONMENT
 
-macos_big_sur_task:
+macos_monterey_task:
   macos_instance:
-    image: big-sur-xcode-12.5
+    image: ghcr.io/cirruslabs/macos-monterey-base:latest
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_ENVIRONMENT
diff --git a/ci/init-external-repos.sh b/ci/init-external-repos.sh
index fa66edec3f..ce2d3f4a6d 100755
--- a/ci/init-external-repos.sh
+++ b/ci/init-external-repos.sh
@@ -51,7 +51,13 @@ 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
-    base64 -d cirrus_key.b64 >cirrus_key
+    if [ "${CIRRUS_TASK_NAME}" == "macos_ventura" ]; then
+        # The base64 command provided with macOS Ventura requires an argument
+        # to pass the input filename
+        base64 -d -i cirrus_key.b64 >cirrus_key
+    else
+        base64 -d cirrus_key.b64 >cirrus_key
+    fi
     rm cirrus_key.b64
     chmod 600 cirrus_key
     git --version

From 0f24a58cf25a11e5f70d3c96d2838bec82d8eff1 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 16 Dec 2022 08:36:05 -0700
Subject: [PATCH 2/2] CI: avoid doing Windows builds with every push

---
 .cirrus.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 04ac9e33a6..915bac58b9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -51,7 +51,7 @@ sanitizers_resource_template: &SANITIZERS_RESOURCE_TEMPLATE
   # For greediness, see https://medium.com/cirruslabs/introducing-greedy-container-instances-29aad06dc2b4
   greedy: true
 
-ci_template: &CI_TEMPLATE
+branch_whitelist: &BRANCH_WHITELIST
   # Rules for skipping builds:
   # - Don't do darwin builds on zeek-security repo because they use up a ton of compute credits.
   # - Always build PRs, but not if they come from dependabot
@@ -66,6 +66,9 @@ ci_template: &CI_TEMPLATE
       )
     ) )
 
+ci_template: &CI_TEMPLATE
+  << : *BRANCH_WHITELIST
+
   # Default timeout is 60 minutes, Cirrus hard limit is 120 minutes for free
   # tasks, so may as well ask for full time.
   timeout_in: 120m
@@ -384,3 +387,4 @@ windows_task:
     ZEEK_CI_CPUS: 8
     # Give verbose error output on a test failure.
     CTEST_OUTPUT_ON_FAILURE: 1
+  << : *BRANCH_WHITELIST