@@ -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
@@ -208,7 +212,7 @@ clang11_zeek_nightly_task:
208
212
209
213
macos_catalina_task :
210
214
osx_instance :
211
- image : catalina-base
215
+ image : $IMAGE_MACOS_CATALINA
212
216
213
217
always :
214
218
ccache_cache :
@@ -219,6 +223,10 @@ macos_catalina_task:
219
223
CCACHE_DIR : /tmp/ccache
220
224
CCACHE_COMPRESS : 1
221
225
226
+ # TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
227
+ update_homebrew_script :
228
+ - brew update
229
+
222
230
# Pull tags as well since by default Cirrus CI does not fetch them, but they
223
231
# are needed for `git describe` used in `scripts/autogen-version`. We also
224
232
# pull submodules here.
@@ -245,7 +253,7 @@ macos_catalina_task:
245
253
246
254
macos_big_sur_task :
247
255
osx_instance :
248
- image : big-sur-base
256
+ image : $IMAGE_MACOS_BIG_SUR
249
257
250
258
always :
251
259
ccache_cache :
@@ -368,18 +376,22 @@ homebrew_catalina_task:
368
376
skip : $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
369
377
370
378
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
372
384
373
385
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
377
389
378
390
homebrew_big_sur_task :
379
391
skip : $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
380
392
381
393
osx_instance :
382
- image : big-sur-base
394
+ image : $IMAGE_MACOS_BIG_SUR
383
395
384
396
script :
385
397
- brew tap zeek/zeek
0 commit comments