From a927c4a998f2cefb136d9d1e712f6e441b3e6720 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Wed, 24 Aug 2022 08:28:00 -0700
Subject: [PATCH] Switch macOS Monterey build to new m1-based VM

---
 .cirrus.yml         | 2 +-
 ci/macos/prepare.sh | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 84a8b1b925..12850b4adf 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -242,7 +242,7 @@ alpine_task:
 # We aim to support both the current and previous macOS release.
 macos_monterey_task:
   macos_instance:
-    image: monterey-xcode-13.1
+    image: ghcr.io/cirruslabs/macos-monterey-base:latest
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_ENVIRONMENT
diff --git a/ci/macos/prepare.sh b/ci/macos/prepare.sh
index f76d948944..8203593813 100755
--- a/ci/macos/prepare.sh
+++ b/ci/macos/prepare.sh
@@ -9,3 +9,11 @@ brew update
 brew upgrade cmake openssl@1.1
 brew install swig bison flex ccache
 python3 -m pip install --user websockets
+
+# Brew doesn't create the /opt/homebrew/opt/openssl symlink if you install
+# openssl@1.1, only with 3.0. Create the symlink if it doesn't exist.
+if [ ! -e /opt/homebrew/opt/openssl ]; then
+    if [ -d /opt/homebrew/opt/openssl@1.1 ]; then
+        ln -s /opt/homebrew/opt/openssl@1.1 /opt/homebrew/opt/openssl
+    fi
+fi