Skip to content

Commit

Permalink
Merge branch 'fix-ci-osx-jobs'
Browse files Browse the repository at this point in the history
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 <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Nov 6, 2019
2 parents e1afbb1 + 91a52b1 commit 08c155f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ci/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 08c155f

Please sign in to comment.