From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.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 12:52:53 -0800 [thread overview]
Message-ID: <xmqq8slx51zu.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200123175645.GF6837@szeder.dev> ("SZEDER =?utf-8?Q?G=C3=A1?= =?utf-8?Q?bor=22's?= message of "Thu, 23 Jan 2020 18:56:45 +0100")
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.
> --- >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 20:53 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
2020-01-23 20:52 ` Junio C Hamano [this message]
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=xmqq8slx51zu.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).