Skip to content

Commit cc5cf78

Browse files
committed
ci(osx): use new location of the perforce cask
The CI builds are failing for Mac OS X due to a change in the location of the perforce cask. The command outputs the following error: + brew install caskroom/cask/perforce Error: caskroom/cask was moved. Tap homebrew/cask-cask instead. Preface the "brew install caskroom/cask/perforce" with the old way of installing perforce, and only try this method if the "brew install perforce" fails. The existing way to use caskroom was added in 672f51c (travis-ci: fix Perforce install on macOS, 2017-01-22) and the justification is that the "brew install perforce" can fail due to a hash mis-match. The mismatch is due to the official Perforce distro updating the published binaries without updating the version string. CI servers are typically fresh virtual machines, so that issue should not arise in automated builds. Even if a build server is re-used and hits the hash mis-match, it will fall back to the "new" mechanism which is currently failing, but may be fixed independently of this change. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Derrick Stolee <[email protected]>
1 parent a3473eb commit cc5cf78

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)