Re: What's cooking in git.git (Jan 2020, #04; Wed, 22)

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 23, 2020, 20:52 UTC
Message-ID: <xmqq8slx51zu.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20200123175645.GF6837@szeder.dev>

SZEDER Gábor <szeder.dev@gmail.com> writes:

> Replacing that last patch of the series with the diff below works both
> on Linux and macOS and both on Travis CI and Azure Pipelines.
>...

Yang, care to do the honors to wrap it up with summary of the decisions as a replacement patch for the last step?

Thanks all for helping to tie loose ends.

Show 26 quoted lines

>  --- >8 ---
>
> 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