undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/azure-ci-osx-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2019-10-24 13:34:02 +09:00
commit 5f0b6ed907
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci/install-dependencies.sh
View File

@ -40,6 +40,11 @@ osx-clang|osx-gcc)
test -z "$BREW_INSTALL_PACKAGES" || test -z "$BREW_INSTALL_PACKAGES" ||
brew install $BREW_INSTALL_PACKAGES brew install $BREW_INSTALL_PACKAGES
brew link --force gettext 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 brew install caskroom/cask/perforce
case "$jobname" in case "$jobname" in
osx-gcc) osx-gcc)