diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:12 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:12 +0300 |
commit | 3846f5c325242efcfef5aa356d315802051caf5a (patch) | |
tree | bda7d2a5d98e79d6548b8949ea9977f3b5a3951f | |
parent | 8926ea6a1255e3ffccba581cf701431b6dbb722b (diff) | |
parent | 37a2e35395feb365d038e2289e61dea1def89beb (diff) |
Merge branch 'sg/ci-brew-gcc-workaround' into maint
Dev support update.
* sg/ci-brew-gcc-workaround:
ci/lib.sh: update a comment about installed P4 and Git-LFS versions
ci: disable Homebrew's auto cleanup
ci: don't update Homebrew
-rwxr-xr-x | ci/install-dependencies.sh | 2 | ||||
-rwxr-xr-x | ci/lib.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 7f6acdd803..8cc72503cb 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -34,7 +34,7 @@ linux-clang|linux-gcc) popd ;; osx-clang|osx-gcc) - brew update >/dev/null + export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 # Uncomment this if you want to run perf tests: # brew install gnu-time test -z "$BREW_INSTALL_PACKAGES" || @@ -163,8 +163,10 @@ linux-clang|linux-gcc) export GIT_TEST_HTTPD=YesPlease # The Linux build installs the defined dependency versions below. - # The OS X build installs the latest available versions. Keep that - # in mind when you encounter a broken OS X build! + # The OS X build installs much more recent versions, whichever + # were recorded in the Homebrew database upon creating the OS X + # image. + # Keep that in mind when you encounter a broken OS X build! export LINUX_P4_VERSION="16.2" export LINUX_GIT_LFS_VERSION="1.5.2" |