Skip to content

Commit 3831132

Browse files
committed
ci/install-depends: attempt to fix "brew cask" stuff
We run "git pull" against "$cask_repo"; clarify that we are expecting not to have any of our own modifications and running "git pull" to merely update, by passing "--ff-only" on the command line. Also, the "brew cask install" command line triggers an error message that says: Error: Calling brew cask install is disabled! Use brew install [--cask] instead. In addition, "brew install caskroom/cask/perforce" step triggers an error that says: Error: caskroom/cask was moved. Tap homebrew/cask instead. Attempt to see if blindly following the suggestion in these error messages gets us into a better shape. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 71ca53e commit 3831132

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ci/install-dependencies.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ osx-clang|osx-gcc)
4444
test -z "$BREW_INSTALL_PACKAGES" ||
4545
brew install $BREW_INSTALL_PACKAGES
4646
brew link --force gettext
47-
brew cask install --no-quarantine perforce || {
47+
brew install --cask --no-quarantine perforce || {
4848
# Update the definitions and try again
4949
cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
50-
git -C "$cask_repo" pull --no-stat &&
51-
brew cask install --no-quarantine perforce
50+
git -C "$cask_repo" pull --no-stat --ff-only &&
51+
brew install --cask --no-quarantine perforce
5252
} ||
53-
brew install caskroom/cask/perforce
53+
brew install homebrew/cask/perforce
5454
case "$jobname" in
5555
osx-gcc)
5656
brew install gcc@9

0 commit comments

Comments
 (0)