Skip to content

Commit 8326456

Browse files
committed
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
2 parents c0f4c5e + 2e48909 commit 8326456

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

ci/lib.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ linux-clang|linux-gcc)
162162
if [ "$jobname" = linux-gcc ]
163163
then
164164
export CC=gcc-8
165+
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
166+
else
167+
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
165168
fi
166169

167170
export GIT_TEST_HTTPD=true
@@ -182,6 +185,9 @@ osx-clang|osx-gcc)
182185
if [ "$jobname" = osx-gcc ]
183186
then
184187
export CC=gcc-9
188+
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
189+
else
190+
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
185191
fi
186192

187193
# t9810 occasionally fails on Travis CI OS X

0 commit comments

Comments
 (0)