Skip to content

Commit 8da6f40

Browse files
committed
Switch the Cirrus macOS images to *-xcode-12.x.
This works around cirruslabs/cirrus-ci-docs#878. Unfortunately the Cataline image is still to old, so also adding a "brew update" for that one (pulling in #952 here).
1 parent de4e201 commit 8da6f40

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

.cirrus.yml

+19-7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ environment:
44
# Enforce sequential JIT'ing of files for controlled memory usage.
55
HILTI_JIT_SEQUENTIAL: 1
66

7+
# Images for macOS
8+
IMAGE_MACOS_BIG_SUR: big-sur-xcode-12.5
9+
IMAGE_MACOS_CATALINA: catalina-xcode-12.2
10+
711
clang9_zeek_ubuntu_debug_task:
812
container:
913
dockerfile: ci/Dockerfile
@@ -208,7 +212,7 @@ clang11_zeek_nightly_task:
208212

209213
macos_catalina_task:
210214
osx_instance:
211-
image: catalina-base
215+
image: $IMAGE_MACOS_CATALINA
212216

213217
always:
214218
ccache_cache:
@@ -219,6 +223,10 @@ macos_catalina_task:
219223
CCACHE_DIR: /tmp/ccache
220224
CCACHE_COMPRESS: 1
221225

226+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
227+
update_homebrew_script:
228+
- brew update
229+
222230
# Pull tags as well since by default Cirrus CI does not fetch them, but they
223231
# are needed for `git describe` used in `scripts/autogen-version`. We also
224232
# pull submodules here.
@@ -245,7 +253,7 @@ macos_catalina_task:
245253

246254
macos_big_sur_task:
247255
osx_instance:
248-
image: big-sur-base
256+
image: $IMAGE_MACOS_BIG_SUR
249257

250258
always:
251259
ccache_cache:
@@ -368,18 +376,22 @@ homebrew_catalina_task:
368376
skip: $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
369377

370378
osx_instance:
371-
image: catalina-base
379+
image: $IMAGE_MACOS_CATALINA
380+
381+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
382+
update_homebrew_script:
383+
- brew update
372384

373385
script:
374-
- brew tap zeek/zeek
375-
- brew install spicy --HEAD
376-
- brew test spicy
386+
- brew tap zeek/zeek
387+
- brew install spicy --HEAD
388+
- brew test spicy
377389

378390
homebrew_big_sur_task:
379391
skip: $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
380392

381393
osx_instance:
382-
image: big-sur-base
394+
image: $IMAGE_MACOS_BIG_SUR
383395

384396
script:
385397
- brew tap zeek/zeek

0 commit comments

Comments
 (0)