From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Yang Zhao <yang.zhao@skyboxlabs.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: What's cooking in git.git (Jan 2020, #04; Wed, 22)
Date: Thu, 23 Jan 2020 18:56:45 +0100 [thread overview]
Message-ID: <20200123175645.GF6837@szeder.dev> (raw)
In-Reply-To: <20200123141626.GB6837@szeder.dev>
On Thu, Jan 23, 2020 at 03:16:26PM +0100, SZEDER Gábor wrote:
> > What's the ideal endgame wrt the tests?
> Running the 'linux-clang' job with Python 2 and the 'linux-gcc' job
> with Python 3 would be the simplest and cheapest, I'd think. We'd
> only need to add the appropriate 'PYTHON_PATH=...' to out MAKEFLAGS.
> As far as Travis CI is concerned, their Xenial image (i.e. the Linux
> image we're using) comes with both 'python2' and 'python3' in PATH, at
> versions v2.7 and v3.5, with the former being the default.
>
> Perhaps we could do the same with the OSX Clang and GCC jobs as well,
> dunno. Travis CI's OSX image, too, comes with both 'python2' and
> 'python3' in PATH, though Python 3 is already at v3.7, but still v2.7
> is the default.
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.
linux-clang with Python 2:
https://travis-ci.org/szeder/git/jobs/640912453#L499
https://dev.azure.com/gitgitgadget/git/_build/results?buildId=27690&view=logs&j=8f20da19-31b7-5cef-4813-95b8788bd086&t=56027f08-fde3-50ad-0c9a-5ec7df432ed0&l=615
linux-gcc with Python 3:
https://travis-ci.org/szeder/git/jobs/640912454#L606
https://dev.azure.com/gitgitgadget/git/_build/results?buildId=27690&view=logs&j=275f1d19-1bd8-5591-b06b-07d489ea915a&t=33e5d3ec-87e7-5f80-0281-074c6962cb44&l=652
osx-clang with Python 2:
https://travis-ci.org/szeder/git/jobs/640912455#L272
https://dev.azure.com/gitgitgadget/git/_build/results?buildId=27690&view=logs&j=b80c90c8-f62d-51c1-0986-3bb8359d9b6f&t=f8b92b00-54c3-55aa-48a6-84ec793cfb94&l=365
osx-gcc with Python 3:
https://travis-ci.org/szeder/git/jobs/640912456#L283
https://dev.azure.com/gitgitgadget/git/_build/results?buildId=27690&view=logs&j=cfa20e98-6997-523c-4233-f0a7302c929f&t=3de1ae02-4adb-5138-54da-65cec5dd3141&l=394
--- >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
next prev parent reply other threads:[~2020-01-23 17:56 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 22:18 What's cooking in git.git (Jan 2020, #04; Wed, 22) Junio C Hamano
2020-01-22 22:37 ` Elijah Newren
2020-01-22 22:45 ` Junio C Hamano
2020-01-22 23:53 ` SZEDER Gábor
2020-01-23 6:06 ` Junio C Hamano
2020-01-23 12:11 ` yz/p4-py3, was " Johannes Schindelin
2020-01-23 18:27 ` Yang Zhao
2020-01-27 12:55 ` SZEDER Gábor
2020-01-23 14:16 ` SZEDER Gábor
2020-01-23 17:56 ` SZEDER Gábor [this message]
2020-01-23 20:52 ` Junio C Hamano
2020-01-24 17:45 ` Yang Zhao
2020-01-25 0:13 ` Johannes Schindelin
2020-01-25 8:31 ` SZEDER Gábor
2020-01-26 9:21 ` Johannes Schindelin
2020-01-23 21:39 ` Johannes Schindelin
2020-01-24 12:02 ` SZEDER Gábor
2020-01-25 0:35 ` Johannes Schindelin
2020-02-05 21:01 ` Junio C Hamano
2020-02-06 0:27 ` SZEDER Gábor
2020-02-06 8:57 ` Johannes Schindelin
2020-02-06 9:06 ` SZEDER Gábor
2020-02-06 11:45 ` Johannes Schindelin
2020-01-23 11:56 ` Johannes Schindelin
2020-01-23 4:29 ` Denton Liu
2020-01-23 6:08 ` Junio C Hamano
2020-01-23 16:54 ` Christian Couder
2020-01-23 20:23 ` Junio C Hamano
2020-01-26 20:07 ` Denton Liu
2020-01-27 18:29 ` Junio C Hamano
2020-01-27 20:26 ` [PATCH] .mailmap: fix erroneous authorship for Derrick Stolee Denton Liu
2020-01-28 17:56 ` Junio C Hamano
2020-01-29 8:59 ` What's cooking in git.git (Jan 2020, #04; Wed, 22) Denton Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200123175645.GF6837@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=yang.zhao@skyboxlabs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.