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

CI: drop macOS Big Sur, add macOS Ventura

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-12-16 08:32:22 -07:00
parent 83a6faec3c
commit 555f705e2d
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.cirrus.yml
View file

@ -264,16 +264,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_monterey_task: macos_ventura_task:
macos_instance: macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest image: ghcr.io/cirruslabs/macos-ventura-base:latest
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *MACOS_ENVIRONMENT << : *MACOS_ENVIRONMENT
macos_big_sur_task: macos_monterey_task:
macos_instance: macos_instance:
image: big-sur-xcode-12.5 image: ghcr.io/cirruslabs/macos-monterey-base:latest
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *MACOS_ENVIRONMENT << : *MACOS_ENVIRONMENT

8
ci/init-external-repos.sh
View file

@ -51,7 +51,13 @@ if [[ -n "${CIRRUS_CI}" ]] && [[ "${CIRRUS_REPO_OWNER}" == "zeek" ]] && [[ ! -d
banner "Trying to clone zeek-testing-private git repo" banner "Trying to clone zeek-testing-private git repo"
echo "${ZEEK_TESTING_PRIVATE_SSH_KEY}" >cirrus_key.b64 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 rm cirrus_key.b64
chmod 600 cirrus_key chmod 600 cirrus_key
git --version git --version