From 73d5a79d77cb611fb424580efec004fc6e802406 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 4 Jun 2020 10:34:10 -0700 Subject: [PATCH 1/3] ci: fix mac bazelisk Signed-off-by: Lizan Zhou --- 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 f3991ac407ead..3d4b24284c647 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -40,6 +40,7 @@ fi # Required as bazel and a foreign bazelisk are installed in the latest macos vm image, we have # to unlink/overwrite them to install bazelisk echo "Installing bazelbuild/tap/bazelisk" +is_installed bazelbuild/tap/bazel && brew unlink bazelbuild/tap/bazel brew install --force bazelbuild/tap/bazelisk brew unlink bazelbuild/tap/bazelisk || true if ! brew link --overwrite bazelbuild/tap/bazelisk; then From 0e1ce618b0412bd43b8c394cd51f9783fe4d772c Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 4 Jun 2020 10:55:41 -0700 Subject: [PATCH 2/3] tap first Signed-off-by: Lizan Zhou --- 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 3d4b24284c647..3265eb67838d7 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -40,6 +40,7 @@ fi # Required as bazel and a foreign bazelisk are installed in the latest macos vm image, we have # to unlink/overwrite them to install bazelisk echo "Installing bazelbuild/tap/bazelisk" +brew tap bazelbuild/tap is_installed bazelbuild/tap/bazel && brew unlink bazelbuild/tap/bazel brew install --force bazelbuild/tap/bazelisk brew unlink bazelbuild/tap/bazelisk || true From c07d09f55437a9e455741076cceb8ea643b47a6d Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 4 Jun 2020 12:09:45 -0700 Subject: [PATCH 3/3] fix Signed-off-by: Lizan Zhou --- ci/mac_ci_setup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh index 3265eb67838d7..b9870f9426968 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -41,9 +41,7 @@ fi # to unlink/overwrite them to install bazelisk echo "Installing bazelbuild/tap/bazelisk" brew tap bazelbuild/tap -is_installed bazelbuild/tap/bazel && brew unlink bazelbuild/tap/bazel -brew install --force bazelbuild/tap/bazelisk -brew unlink bazelbuild/tap/bazelisk || true +brew reinstall --force bazelbuild/tap/bazelisk if ! brew link --overwrite bazelbuild/tap/bazelisk; then echo "Failed to install and link bazelbuild/tap/bazelisk" exit 1