Skip to content

Commit f0c4615

Browse files
Merge pull request #210: ci(osx): use new location of the perforce cask
This fix is a rebase of gitgitgadget#400. 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. So let's try to call `brew cask install perforce` first (which is what that error message suggests, in a most round-about way). The "caskroom" way was added in 672f51c (travis-ci: fix Perforce install on macOS, 2017-01-22) and the justification is that the call "brew cask install perforce" can fail due to a checksum mismatch: the recipe simply downloads the official Perforce distro, and whenever that is updated, the recipe needs to be updated, too. CI servers are typically fresh virtual machines, but not always. To accommodate for that, let's try harder if `brew cask install perforce` fails, by specifically pulling the latest `master` of the `homebrew-cask` repository. This will still fail, of course, when `homebrew-cask` falls behind Perforce's release schedule. But once it is updated, we can now simply re-run the failed jobs and they will pick up that update. As for updating `homebrew-cask`: the beginnings of automating this in https://dev.azure.com/gitgitgadget/git/_build?definitionId=11&_a=summary will be finished once the next Perforce upgrade comes around.
2 parents afc37de + 0a7cb6d commit f0c4615

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)