Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add macOS Monterey and drop Catalina in CI

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
.cirrus.yml
View file

@ -219,16 +219,16 @@ alpine_task:
# Apple doesn't publish official long-term support timelines. # Apple doesn't publish official long-term support timelines.
# We aim to support both the current and previous macOS release. # We aim to support both the current and previous macOS release.
macos_big_sur_task: macos_monterey_task:
macos_instance: macos_instance:
image: big-sur-xcode-12.5 image: monterey-xcode-13.1
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *MACOS_RESOURCES_TEMPLATE << : *MACOS_RESOURCES_TEMPLATE
macos_catalina_task: macos_big_sur_task:
macos_instance: macos_instance:
image: catalina-xcode image: big-sur-xcode-12.5
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *MACOS_RESOURCES_TEMPLATE << : *MACOS_RESOURCES_TEMPLATE

5
ci/build.sh
View file

@ -10,6 +10,11 @@ set -x
# some problems with Catalina specifically, but it doesn't break anything on Big Sur either. # some problems with Catalina specifically, but it doesn't break anything on Big Sur either.
if [[ "${CIRRUS_OS}" == "darwin" ]]; then if [[ "${CIRRUS_OS}" == "darwin" ]]; then
export ZEEK_CI_CONFIGURE_FLAGS="${ZEEK_CI_CONFIGURE_FLAGS} --osx-sysroot=$(xcrun --show-sdk-path)" 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 fi
if [[ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]]; then if [[ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]]; then