diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-24 04:34:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-24 04:34:02 (GMT) |
| commit | 5f0b6ed90739f9a62685360be4a30fe0b80ce06a (patch) | |
| tree | d686d97cdc10414b811409d04f13cb2a03cd8dad | |
| parent | c555caab7a303109d6c712d757bc4621a3ee0bbd (diff) | |
| parent | 0eb3671ed96f74b79e54a1101746882bafe50070 (diff) | |
| download | git-5f0b6ed90739f9a62685360be4a30fe0b80ce06a.zip git-5f0b6ed90739f9a62685360be4a30fe0b80ce06a.tar.gz git-5f0b6ed90739f9a62685360be4a30fe0b80ce06a.tar.bz2 | |
Merge branch 'js/azure-ci-osx-fix'
Update installation procedure for Perforce on MacOS in the CI jobs
running on Azure pipelines, which was failing.
* js/azure-ci-osx-fix:
ci(osx): use new location of the `perforce` cask
| -rwxr-xr-x | ci/install-dependencies.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 85a9d6b..ce149ed 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -40,6 +40,11 @@ osx-clang|osx-gcc) test -z "$BREW_INSTALL_PACKAGES" || brew install $BREW_INSTALL_PACKAGES brew link --force gettext + brew cask install perforce || { + # Update the definitions and try again + git -C "$(brew --repository)"/Library/Taps/homebrew/homebrew-cask pull && + brew cask install perforce + } || brew install caskroom/cask/perforce case "$jobname" in osx-gcc) |