summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-21 02:06:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-21 02:06:05 (GMT)
commit281bebaf4271fd5969dbf2598354dc0387d5d6dd (patch)
treed35bcbfb9309263b1e1c34616abac1fdcab15a16
parenteb33976b5c8a4de3bc94e696f37f682a7c066c30 (diff)
parent2e4890900be7deec78b701cc276fc00c83c34cab (diff)
downloadgit-281bebaf4271fd5969dbf2598354dc0387d5d6dd.zip
git-281bebaf4271fd5969dbf2598354dc0387d5d6dd.tar.gz
git-281bebaf4271fd5969dbf2598354dc0387d5d6dd.tar.bz2
Merge branch 'yz/p4-py3' into pu
Update "git p4" to work with Python 3. Hold. * yz/p4-py3: ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
-rwxr-xr-xci/lib.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index a90d0dc..c3a8cd2 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -162,6 +162,9 @@ linux-clang|linux-gcc)
if [ "$jobname" = linux-gcc ]
then
export CC=gcc-8
+ MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
+ else
+ MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
fi
export GIT_TEST_HTTPD=true
@@ -182,6 +185,9 @@ osx-clang|osx-gcc)
if [ "$jobname" = osx-gcc ]
then
export CC=gcc-9
+ MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
+ else
+ MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
fi
# t9810 occasionally fails on Travis CI OS X