Skip to content

Commit 9d1d43f

Browse files
committed
Merge branch 'fix-ci-osx-jobs'
We need this to make the CI/PR builds green. This was also submitted to git.git via gitgitgadget#400 (which already made it to `next` and hopefully will make it into v2.24.0-rc1). Signed-off-by: Johannes Schindelin <[email protected]>
2 parents a3473eb + cc5cf78 commit 9d1d43f

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)