CI: retry a failed brew update too, not just brew install

Also, make sure an eventual failure ends up returning a failure code so
the job stops.

diff --git a/.cirrus.yml b/.cirrus.yml
index b1cb1af21e4f954fdd10f7f64ca0c91a34405c0f..4886e413a715f63676c717bde7fa6e6d072ba408 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -210,7 +210,7 @@ macos_task:
 
   pkginstall_script:
     - echo libtool autoconf automake pkg-config ${install_packages} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
-    - brew update && for i in 1 2 3; do brew bundle install --no-lock --file /tmp/Brewfile && break || sleep 1; done
+    - "for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break || { echo Error: wait to try again; sleep 10; false; } done"
     - sudo -H python3 -m pip install --upgrade pip
     - sudo -H python3 -m pip install impacket
   configure_script:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ba6cefc991a8bfdd3211782c7fdf1dd5d300d098..16077e7d8215b8f1b0d88cfa0786bbb6eeac5855 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -96,7 +96,7 @@ jobs:
     # Run this command with retries because of spurious failures seen
     # while running the tests, for example
     # https://github.com/curl/curl/runs/4095721123?check_suite_focus=true
-    - run: brew update && for i in 1 2 3; do brew bundle install --no-lock --file /tmp/Brewfile && break || sleep 1; done
+    - run: "for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break || { echo Error: wait to try again; sleep 10; false; } done"
       name: 'brew install'
 
     - run: python3 -m pip install impacket
@@ -155,7 +155,7 @@ jobs:
     - run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
       name: 'brew bundle'
 
-    - run: brew update && brew bundle install --no-lock --file /tmp/Brewfile
+    - run: "for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break || { echo Error: wait to try again; sleep 10; false; } done"
       name: 'brew install'
 
     - run: python3 -m pip install impacket