mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
5f0b6ed907
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue