Add macOS Monterey and drop Catalina in CI

This commit is contained in:
Christian Kreibich 2021-11-03 13:52:40 -07:00
parent f7d18eeb9e
commit bac833a2f9
2 changed files with 9 additions and 4 deletions

View file

@ -10,6 +10,11 @@ set -x
# 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)"
# Starting with Monterey & Xcode 13.1 we need to help it find OpenSSL
if [ -d /usr/local/opt/openssl@1.1/lib/pkgconfig ]; then
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig
fi
fi
if [[ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]]; then