]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sg/travis-osx-brew-breakage-workaround'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:28 +0000 (22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:28 +0000 (22:05 -0800)
The way the OSX build jobs updates its build environment used the
"--quiet" option to "brew update" command, but it wasn't all that
quiet to be useful.  The use of the option has been replaced with
an explicit redirection to the /dev/null (which incidentally would
have worked around a breakage by recent updates to homebrew, which
has fixed itself already).

* sg/travis-osx-brew-breakage-workaround:
  travis-ci: make the OSX build jobs' 'brew update' more quiet

1  2 
ci/install-dependencies.sh

index 608ff964dee0c15c2c2a97c15fc5a86d5138488a,5968efdbbef2ebdbee0dd59377e851805c88ef37..d64667fcbfef80e4603d97f7825399dea5be0b6b
@@@ -34,18 -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