Skip to content

Commit 721a8c2

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 0c4d078 commit 721a8c2

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
@@ -211,7 +215,7 @@ clang11_zeek_nightly_task:
211215

212216
macos_catalina_task:
213217
osx_instance:
214-
image: catalina-base
218+
image: $IMAGE_MACOS_CATALINA
215219

216220
always:
217221
ccache_cache:
@@ -222,6 +226,10 @@ macos_catalina_task:
222226
CCACHE_DIR: /tmp/ccache
223227
CCACHE_COMPRESS: 1
224228

229+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
230+
update_homebrew_script:
231+
- brew update
232+
225233
# Pull tags as well since by default Cirrus CI does not fetch them, but they
226234
# are needed for `git describe` used in `scripts/autogen-version`. We also
227235
# pull submodules here.
@@ -248,7 +256,7 @@ macos_catalina_task:
248256

249257
macos_big_sur_task:
250258
osx_instance:
251-
image: big-sur-base
259+
image: $IMAGE_MACOS_BIG_SUR
252260

253261
always:
254262
ccache_cache:
@@ -371,18 +379,22 @@ homebrew_catalina_task:
371379
skip: $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
372380

373381
osx_instance:
374-
image: catalina-base
382+
image: $IMAGE_MACOS_CATALINA
383+
384+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
385+
update_homebrew_script:
386+
- brew update
375387

376388
script:
377-
- brew tap zeek/zeek
378-
- brew install spicy --HEAD
379-
- brew test spicy
389+
- brew tap zeek/zeek
390+
- brew install spicy --HEAD
391+
- brew test spicy
380392

381393
homebrew_big_sur_task:
382394
skip: $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
383395

384396
osx_instance:
385-
image: big-sur-base
397+
image: $IMAGE_MACOS_BIG_SUR
386398

387399
script:
388400
- brew tap zeek/zeek

0 commit comments

Comments
 (0)