From e23bb6113b7abe9ecb092ced1f36ea3f9bfd3611 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Fri, 16 Oct 2020 20:12:44 +0200 Subject: [PATCH] More macOS CI fixes (#2352) * Revert "Fix macOS CI (#2345)" This reverts commit 72a996a8857f98f3cc30c6fe4cef37596e6c6fdf. * ignore update output --- tools/mac_setup.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/mac_setup.sh b/tools/mac_setup.sh index 0b81f86fb1..c917d77f30 100755 --- a/tools/mac_setup.sh +++ b/tools/mac_setup.sh @@ -1,7 +1,13 @@ #!/bin/bash -e -echo "Updating Homebrew" -brew update +# Install brew if required. +if [[ $(command -v brew) == "" ]]; then + echo "Installing Hombrew" + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" +else + echo "Updating Homebrew" + brew update || true +fi brew install capnp \ czmq \