Skip to content

Commit 5f0b6ed

Browse files
committed
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
2 parents c555caa + 0eb3671 commit 5f0b6ed

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

ci/install-dependencies.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ osx-clang|osx-gcc)
4040
test -z "$BREW_INSTALL_PACKAGES" ||
4141
brew install $BREW_INSTALL_PACKAGES
4242
brew link --force gettext
43+
brew cask install perforce || {
44+
# Update the definitions and try again
45+
git -C "$(brew --repository)"/Library/Taps/homebrew/homebrew-cask pull &&
46+
brew cask install perforce
47+
} ||
4348
brew install caskroom/cask/perforce
4449
case "$jobname" in
4550
osx-gcc)

0 commit comments

Comments
 (0)