undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/macos-install-dependencies-fix'

Browse Source 
Fix for procedure to building CI test environment for mac.

* jc/macos-install-dependencies-fix:
  ci/install-depends: attempt to fix "brew cask" stuff
This commit is contained in:
Junio C Hamano 2021-01-15 21:48:47 -08:00
commit 49656f9445
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/install-dependencies.sh
View File

@ -44,13 +44,13 @@ osx-clang|osx-gcc)
test -z "$BREW_INSTALL_PACKAGES" || test -z "$BREW_INSTALL_PACKAGES" ||
brew install $BREW_INSTALL_PACKAGES brew install $BREW_INSTALL_PACKAGES
brew link --force gettext brew link --force gettext
brew cask install --no-quarantine perforce || { brew install --cask --no-quarantine perforce || {
# Update the definitions and try again # Update the definitions and try again
cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask && cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
git -C "$cask_repo" pull --no-stat && git -C "$cask_repo" pull --no-stat --ff-only &&
brew cask install --no-quarantine perforce brew install --cask --no-quarantine perforce
} || } ||
brew install caskroom/cask/perforce brew install homebrew/cask/perforce
case "$jobname" in case "$jobname" in
osx-gcc) osx-gcc)
brew install gcc@9 brew install gcc@9