From 089b60a4820c4ba69eddfede13b381369265a251 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 4 Mar 2021 08:42:57 +0000 Subject: [PATCH 1/2] ci: Fix macosx install flake Signed-off-by: Ryan Northey --- ci/mac_ci_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh index 88f8c406dd655..2978784cd7aa0 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -22,6 +22,7 @@ function is_installed { function install { echo "Installing $1" + brew link --overwrite "$1" if ! brew install "$1"; then echo "Failed to install $1" exit 1 From e6ccd05d19504470da0587d01f15ee2dcf206a8e Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 4 Mar 2021 09:25:54 +0000 Subject: [PATCH 2/2] ci/ Signed-off-by: Ryan Northey --- ci/mac_ci_setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh index 2978784cd7aa0..f6cd976b59e20 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -22,7 +22,6 @@ function is_installed { function install { echo "Installing $1" - brew link --overwrite "$1" if ! brew install "$1"; then echo "Failed to install $1" exit 1 @@ -48,7 +47,7 @@ if ! retry brew update; then echo "Failed to update homebrew" fi -DEPS="automake cmake coreutils go libtool wget ninja" +DEPS="automake cmake coreutils libtool wget ninja" for DEP in ${DEPS} do is_installed "${DEP}" || install "${DEP}"