Merge remote-tracking branch 'origin/topic/timw/test-catalina-build'

* origin/topic/timw/test-catalina-build:
  Call brew update-reset in ci/macos/prepare.sh
  GH-1368: Use --osx-sysroot for macOS CI builds

.cirrus.yml

@@ -219,7 +219,7 @@ macos_big_sur_task:
 
 macos_catalina_task:
   macos_instance:
-    image: catalina-xcode-11.6
+    image: catalina-xcode
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_RESOURCES_TEMPLATE

CHANGES

@@ -1,3 +1,13 @@
+4.1.0-dev.755 | 2021-06-23 13:53:54 -0700
+
+  * Call brew update-reset in ci/macos/prepare.sh
+
+    This fixes some issues with the Catalina builds when it prepares the image
+    and the base Cirrus image has old recipes for Homebrew. The VM then has
+    to build a bunch of packages it shouldn't need to. (Tim Wojtulewicz, Corelight)
+
+  * GH-1368: Use --osx-sysroot for macOS CI builds (Tim Wojtulewicz, Corelight)
+
 4.1.0-dev.750 | 2021-06-21 16:14:03 -0700
 
   * Remove the Stepping Stone analyzer

VERSION

@@ -1 +1 @@
-4.1.0-dev.750
+4.1.0-dev.755

ci/build.sh

@@ -3,6 +3,12 @@
 set -e
 set -x
 
+# If we're on macOS, use --osx-sysroot to ensure we can find the SDKs from Xcode. This avoids
+# some problems with Catalina specifically, but it doesn't break anything on Big Sur either.
+if [ "${CIRRUS_OS}" == "darwin" ]; then
+    export ZEEK_CI_CONFIGURE_FLAGS="${ZEEK_CI_CONFIGURE_FLAGS} --osx-sysroot=$(xcrun --show-sdk-path)"
+fi
+
 if [ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]; then
     ./configure ${ZEEK_CI_CONFIGURE_FLAGS}
     cd build

ci/macos/prepare.sh

@@ -5,5 +5,6 @@ sysctl hw.model hw.machine hw.ncpu hw.physicalcpu hw.logicalcpu
 set -e
 set -x
 
+brew update-reset
 brew upgrade cmake openssl
 brew install swig bison