aboutsummaryrefslogtreecommitdiff
path: root/ci/lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-11 15:16:49 -0700
committerJunio C Hamano <gitster@pobox.com>2019-07-11 15:16:49 -0700
commite1cee0b84335c2ad9ffbbcb96d34850eeb5f17fd (patch)
tree42e2e9e1b1d990310585e30e1596d511baf442f8 /ci/lib.sh
parent0328db0c2b22e9ef83f1e66cad45a330935ddb87 (diff)
parent37a2e35395feb365d038e2289e61dea1def89beb (diff)
downloadgit-e1cee0b84335c2ad9ffbbcb96d34850eeb5f17fd.tar.xz
Merge branch 'sg/ci-brew-gcc-workaround'
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
Diffstat (limited to 'ci/lib.sh')
-rwxr-xr-xci/lib.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index 288a5b3884..0c7171a173 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -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"