Re: yz/p4-py3, was Re: What's cooking in git.git (Feb 2020, #03; Wed, 12)

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 13, 2020, 21:18 UTC
Message-ID: <xmqqk14qqj7n.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <xmqq7e0qtqsm.fsf@gitster-ct.c.googlers.com>

Junio C Hamano <gitster@pobox.com> writes:

> OK, any one of you wants to do the honors of wrapping up the
> proposed patch with a log message to replace the tip commit to allow
> us to move forward?

So the diff was taken from <20200123175645.GF6837@szeder.dev>; with Szeder's SoB (and possibly wordsmithing the log message) let's tie this loose end.

Thanks.

-- >8 --

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Thu, 23 Jan 2020 18:56:45 +0100
Subject: [PATCH] ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere

Python2 reached end of life, and we have been preparing git-p4 (which is the sole in-tree user of Python) to work with Python3 but we haven't told our CI jobs to use Python3 anywhere yet.

Pick two jobs and use Python3 there, while leaving other jobs to still stick to Python2 for now.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 ci/lib.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ci/lib.sh b/ci/lib.sh
index a90d0dc0fd..c3a8cd2104 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

-- 
2.25.0-462-gba6e6679b4