Skip to content

Commit 656501a

Browse files
committed
Work around for Cirrus Homebrew issue.
The osx machines we currently use in Cirrus CI seem to be affected by cirruslabs/cirrus-ci-docs#878. In order to work around this this patch adds a manual Homebrew upgrade before installing any packages. As this takes time we should probably remove this step once upstream has merged a fix.
1 parent 6e6e34e commit 656501a

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

.cirrus.yml

+22-6
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ macos_catalina_task:
229229
- git fetch --tags
230230
- git submodule update --recursive --init
231231

232+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
233+
homebrew_update_script:
234+
- brew update
235+
232236
install_dependencies_script:
233237
- brew install llvm bison flex cmake ninja [email protected] sphinx-doc doxygen ccache zeek
234238
- pip3 install "btest>=0.66" sphinx_rtd_theme
@@ -266,6 +270,10 @@ macos_big_sur_task:
266270
- git fetch --tags
267271
- git submodule update --recursive --init
268272

273+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
274+
homebrew_update_script:
275+
- brew update
276+
269277
install_dependencies_script:
270278
- brew install bison flex cmake ninja [email protected] sphinx-doc doxygen ccache zeek
271279
- pip3 install btest sphinx_rtd_theme zkg
@@ -373,21 +381,29 @@ homebrew_catalina_task:
373381
osx_instance:
374382
image: catalina-base
375383

384+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
385+
homebrew_update_script:
386+
- brew update
387+
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:
385397
image: big-sur-base
386398

399+
# TODO(bbannier): This is a temporary workaround for cirruslabs/cirrus-ci-docs#878.
400+
homebrew_update_script:
401+
- brew update
402+
387403
script:
388-
- brew tap zeek/zeek
389-
- brew install spicy --HEAD
390-
- brew test spicy
404+
- brew tap zeek/zeek
405+
- brew install spicy --HEAD
406+
- brew test spicy
391407

392408
docker_alpine_3_12_task:
393409
container:

0 commit comments

Comments
 (0)