summaryrefslogtreecommitdiff
path: root/ci/install-dependencies.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/install-dependencies.sh')
-rwxr-xr-xci/install-dependencies.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 06c3546..d64667f 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -3,7 +3,7 @@
# Install dependencies required to build and test Git on Linux and macOS
#
-. ${0%/*}/lib-travisci.sh
+. ${0%/*}/lib.sh
P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
@@ -34,12 +34,18 @@ linux-clang|linux-gcc)
popd
;;
osx-clang|osx-gcc)
- brew update --quiet
+ brew update >/dev/null
# Uncomment this if you want to run perf tests:
# brew install gnu-time
- brew install git-lfs gettext
+ test -z "$BREW_INSTALL_PACKAGES" ||
+ brew install $BREW_INSTALL_PACKAGES
brew link --force gettext
brew install caskroom/cask/perforce
+ case "$jobname" in
+ osx-gcc)
+ brew link gcc@8
+ ;;
+ esac
;;
StaticAnalysis)
sudo apt-get -q update