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

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 85a9d6b15cdc539e4995a05483cfcefa105c36ab..ce149ed39c35836d585c8bc574d7b17f03963b2e 100755 (executable)
--- 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)