Skip to content

Commit

Permalink
ci: cleanup Kokoro macOS builds (#10418)
Browse files Browse the repository at this point in the history
Over the years we accumulated a number of steps to "fix" the Kokoro
macOS configuration.  We have updated the Kokoro base image a couple of
times, and the same problems are unlikely to still be there.  We also
kept going after `gcloud install` failed. The build breaks anyway, it is
better to stop the build early.
  • Loading branch information
coryan committed Dec 10, 2022
1 parent e69ab23 commit 5af495b
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions ci/kokoro/macos/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@ export HOMEBREW_NO_INSTALL_CLEANUP=1
brew list --versions --formula
brew list --versions --cask
brew list --versions coreutils || brew install coreutils
# We re-install google-cloud-sdk because the package is broken on some kokoro
# machines, but we ignore errors here because maybe the local version works.
if [[ "${RUNNING_CI:-}" = "yes" ]]; then
brew reinstall google-cloud-sdk || true
gcloud components install alpha || true
python -m pip install google-crc32c --target /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/lib/third_party || true
# We use `gcloud alpha storage` as it significantly improves the
# upload and download performance of the cache. If this step fails
# the build will fail anyway.
ci/retry-command.sh 3 120 gcloud components install gcloud-crc32c alpha
fi

readonly KOKORO_GFILE_DIR="${KOKORO_GFILE_DIR:-/private/var/tmp}"
Expand Down

0 comments on commit 5af495b

Please sign in to comment.