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

Merge remote-tracking branch 'origin/topic/timw/ci-macos-sequoia'

Browse source 
* origin/topic/timw/ci-macos-sequoia:
  ci/init-external-repo.sh: Use regex to match macos cirrus task
  CI: Change macOS runner to Sequoia

(cherry picked from commit 43f108bb71)
This commit is contained in:
Tim Wojtulewicz 2025-03-17 11:55:11 -07:00
parent eed9858bc4
commit ed32ee73fa
4 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.cirrus.yml
View file

@ -346,12 +346,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

14
CHANGES
View file

@ -1,3 +1,17 @@
7.0.5-6 | 2025-03-18 16:20:53 -0700
* ci/init-external-repo.sh: Use regex to match macos cirrus task (Arne Welzel, Corelight)
(cherry picked from commit 43f108bb71bca8cec7faeb8d1aeae5c5920fcee6)
* CI: Change macOS runner to Sequoia (Tim Wojtulewicz, Corelight)
(cherry picked from commit 43f108bb71bca8cec7faeb8d1aeae5c5920fcee6)
* Update mozilla-ca-list.zeek and ct-list.zeek to NSS 3.109 (Tim Wojtulewicz, Corelight)
* CI: Update freebsd to 13.4 and 14.2 (Tim Wojtulewicz, Corelight)
7.0.5-4 | 2025-03-18 16:17:54 -0700
* Add analyzer registration from VLAN to VNTAG (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.5-4
7.0.5-6

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

@ -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