Skip to content

Commit 625db81

Browse files
committed
fixup! ci(osx): use new location of the perforce cask
It still fails! *Still!* Even after upgrading the cask's definition in the PR Homebrew/homebrew-cask#70981 does it fail. The explanation is, as Gábor Szeder dug out from the commit history: the local definitions might get stale and need to be updated. So let's just update them in case `brew cask install perforce` fails, and just try again! 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 to updating `homebrew-cask`: I started automating this, via https://dev.azure.com/gitgitgadget/git/_build?definitionId=11&_a=summary (I plan on finishing it once the next Perforce upgrade comes around.) Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b2da288 commit 625db81

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ci/install-dependencies.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +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 ||
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+
} ||
4448
brew install caskroom/cask/perforce
4549
case "$jobname" in
4650
osx-gcc)

0 commit comments

Comments
 (0)