diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:26 -0800 |
| commit | 8ff9ec4be60f8cc6f1a6a79ad43700bdd60a8d88 (patch) | |
| tree | 27d99a0c69013f692973480675913647bd5ce605 | |
| parent | Merge branch 'tb/local-clone-race-doc' into maint (diff) | |
| parent | ci/install-depends: attempt to fix "brew cask" stuff (diff) | |
| download | git-8ff9ec4be60f8cc6f1a6a79ad43700bdd60a8d88.tar.gz git-8ff9ec4be60f8cc6f1a6a79ad43700bdd60a8d88.zip | |
Merge branch 'jc/macos-install-dependencies-fix' into maint
Fix for procedure to building CI test environment for mac.
* jc/macos-install-dependencies-fix:
ci/install-depends: attempt to fix "brew cask" stuff
| -rwxr-xr-x | ci/install-dependencies.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 0229a77f7d..0b1184e04a 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -44,13 +44,13 @@ osx-clang|osx-gcc) test -z "$BREW_INSTALL_PACKAGES" || brew install $BREW_INSTALL_PACKAGES brew link --force gettext - brew cask install --no-quarantine perforce || { + brew install --cask --no-quarantine perforce || { # Update the definitions and try again cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask && - git -C "$cask_repo" pull --no-stat && - brew cask install --no-quarantine perforce + git -C "$cask_repo" pull --no-stat --ff-only && + brew install --cask --no-quarantine perforce } || - brew install caskroom/cask/perforce + brew install homebrew/cask/perforce case "$jobname" in osx-gcc) brew install gcc@9 |