diff --git a/.cirrus.yml b/.cirrus.yml index 59d592be5e..1d01927ddd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -377,12 +377,12 @@ alpine_task: # Cirrus only supports the following macos runner currently, selecting # anything else automatically upgrades to this one. # -# ghcr.io/cirruslabs/macos-runner:sonoma +# ghcr.io/cirruslabs/macos-runner:sequoia # # See also: https://cirrus-ci.org/guide/macOS/ -macos_sonoma_task: +macos_sequoia_task: macos_instance: - image: ghcr.io/cirruslabs/macos-runner:sonoma + image: ghcr.io/cirruslabs/macos-runner:sequoia prepare_script: ./ci/macos/prepare.sh << : *CI_TEMPLATE << : *MACOS_ENVIRONMENT diff --git a/CHANGES b/CHANGES index 67db85f915..384c66e0e9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.2.0-dev.318 | 2025-03-17 11:55:11 -0700 + + * ci/init-external-repo.sh: Use regex to match macos cirrus task (Arne Welzel, Corelight) + + * CI: Change macOS runner to Sequoia (Tim Wojtulewicz, Corelight) + 7.2.0-dev.314 | 2025-03-12 13:10:58 +0100 * github/generate-docs: Run pre-commit (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index 928ee9da78..171d6d3002 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0-dev.314 +7.2.0-dev.318 diff --git a/ci/init-external-repos.sh b/ci/init-external-repos.sh index 7f27f582be..eeb693f1f6 100755 --- a/ci/init-external-repos.sh +++ b/ci/init-external-repos.sh @@ -51,9 +51,9 @@ if [[ -n "${CIRRUS_CI}" ]] && [[ "${CIRRUS_REPO_OWNER}" == "zeek" ]] && [[ ! -d banner "Trying to clone zeek-testing-private git repo" echo "${ZEEK_TESTING_PRIVATE_SSH_KEY}" >cirrus_key.b64 - if [ "${CIRRUS_TASK_NAME}" == "macos_ventura" -o "${CIRRUS_TASK_NAME}" == "macos_sonoma" ]; then - # The base64 command provided with macOS Ventura/Sonoma requires an argument - # to pass the input filename + if [[ "${CIRRUS_TASK_NAME}" =~ ^macos_ ]]; then + # The base64 command provided with macOS requires an argument + # to pass the input filename, while -i elsewhere is "ignore garbage". base64 -d -i cirrus_key.b64 >cirrus_key else base64 -d cirrus_key.b64 >cirrus_key