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]>
git-for-windows · Nov 6, 2019 · 08c155f · 08c155f
2 parents e1afbb1 + 91a52b1
commit 08c155f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
@@ -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)