From b1cb969e8ab9ad86fec3ce30cb732f4c42e015e0 Mon Sep 17 00:00:00 2001
From: Tim Ruffing <crypto@timruffing.de>
Date: Tue, 8 Feb 2022 13:53:05 +0100
Subject: [PATCH 1/2] ci: Revert "Attempt to make macOS builds more reliable"

This reverts commit d9396a56da13df97827e193f636a7593fb4d7864, which
didn't have the desired effect.
---
 .cirrus.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index b1ccb4d3d07cc..727a73f37f35e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -135,9 +135,7 @@ task:
   ##   - rm /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
   ##
   brew_valgrind_pre_script:
-    # Reinstall brew. We could do `brew update` instead but that often fails.
-    - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
-    - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    - brew update
     - brew config
     - brew tap LouisBrunner/valgrind
     # Fetch valgrind source but don't build it yet.

From e51ad3b737a2f12605d346cf9c0e7eaabf6a39ec Mon Sep 17 00:00:00 2001
From: Tim Ruffing <crypto@timruffing.de>
Date: Tue, 8 Feb 2022 14:09:58 +0100
Subject: [PATCH 2/2] ci: Retry `brew update` a few times to avoid random
 failures

---
 .cirrus.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 727a73f37f35e..a352406e2b932 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -135,7 +135,8 @@ task:
   ##   - rm /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
   ##
   brew_valgrind_pre_script:
-    - brew update
+    # Retry a few times because this tends to fail randomly.
+    - for i in {1..5}; do brew update && break || sleep 15; done
     - brew config
     - brew tap LouisBrunner/valgrind
     # Fetch valgrind source but don't build it yet.