Sync with 2.32.7

[thirdparty/git.git] / ci / lib.sh

diff --git a/ci/lib.sh b/ci/lib.sh
index 476c3f369f549d69f52723c21d65bd4bf8e93da6..1deb8ca352b235125ac0e0bd0f999b53e0b08f2a 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -184,13 +184,13 @@ export SKIP_DASHED_BUILT_INS=YesPlease
 
 case "$jobname" in
 linux-clang|linux-gcc)
+       PYTHON_PACKAGE=python2
        if [ "$jobname" = linux-gcc ]
        then
                export CC=gcc-8
-               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3"
-       else
-               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2"
+               PYTHON_PACKAGE=python3
        fi
+       MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"
 
        export GIT_TEST_HTTPD=true
 
@@ -199,7 +199,6 @@ linux-clang|linux-gcc)
        # 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"
 
        P4_PATH="$HOME/custom/p4"