@@ -4,6 +4,10 @@ environment:
4
4
# Enforce sequential JIT'ing of files for controlled memory usage.
5
5
HILTI_JIT_SEQUENTIAL : 1
6
6
7
+ # Images for macOS
8
+ IMAGE_MACOS_BIG_SUR : big-sur-xcode-12.5
9
+ IMAGE_MACOS_CATALINA : catalina-xcode-12.2
10
+
7
11
clang9_zeek_ubuntu_debug_task :
8
12
container :
9
13
dockerfile : ci/Dockerfile
@@ -211,7 +215,7 @@ clang11_zeek_nightly_task:
211
215
212
216
macos_catalina_task :
213
217
osx_instance :
214
- image : catalina-base
218
+ image : $IMAGE_MACOS_CATALINA
215
219
216
220
always :
217
221
ccache_cache :
@@ -222,6 +226,10 @@ macos_catalina_task:
222
226
CCACHE_DIR : /tmp/ccache
223
227
CCACHE_COMPRESS : 1
224
228
229
+ # TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
230
+ update_homebrew_script :
231
+ - brew update
232
+
225
233
# Pull tags as well since by default Cirrus CI does not fetch them, but they
226
234
# are needed for `git describe` used in `scripts/autogen-version`. We also
227
235
# pull submodules here.
@@ -248,7 +256,7 @@ macos_catalina_task:
248
256
249
257
macos_big_sur_task :
250
258
osx_instance :
251
- image : big-sur-base
259
+ image : $IMAGE_MACOS_BIG_SUR
252
260
253
261
always :
254
262
ccache_cache :
@@ -371,18 +379,22 @@ homebrew_catalina_task:
371
379
skip : $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
372
380
373
381
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
375
387
376
388
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
380
392
381
393
homebrew_big_sur_task :
382
394
skip : $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
383
395
384
396
osx_instance :
385
- image : big-sur-base
397
+ image : $IMAGE_MACOS_BIG_SUR
386
398
387
399
script :
388
400
- brew tap zeek/zeek
0 commit comments