Merge branch 'du/branch-show-current'

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index fe6514415277c2433229a9af55a1d90c66490880..d64667fcbfef80e4603d97f7825399dea5be0b6b 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -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