git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
	"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>,
	git@vger.kernel.org
Subject: Re: [PATCH v2 3/3] ci: stop linking built-ins to the dashed versions
Date: Wed, 26 Aug 2020 09:24:16 -0700	[thread overview]
Message-ID: <xmqqtuwpwf2n.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqq5z95xu5f.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Wed, 26 Aug 2020 09:13:16 -0700")

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

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
>> Actually, `SKIP_DASHED_BUILT_INS` does not _only_ have an impact on `make
>> install`:
>> ...
>> See how `git-add.exe` is linked in the first, but not in the second run?
>
> OK, that is one more reason why we do want to have 3/3 applied not
> for all tasks in the CI , but for subset of tasks that includes the
> Windows task.  If we had multiple Windows tasks, it may even be
> better to have only to some tasks, and allow other tasks build
> git-add.exe, so that both can be tested for the primary intended
> platform.

In other words, something like this squashed in.

 ci/run-build-and-tests.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 1df9402c3b..cfb841d981 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -5,12 +5,16 @@
 
 . ${0%/*}/lib.sh
 
+BUILTINS_HOW=
 case "$CI_OS_NAME" in
-windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
-*) ln -s "$cache_dir/.prove" t/.prove;;
+windows*) 
+	BUILTINS_HOW=SKIP_DASHED_BUILT_INS=YesPlease
+	cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
+*)
+	ln -s "$cache_dir/.prove" t/.prove;;
 esac
 
-make SKIP_DASHED_BUILT_INS=YesPlease
+make $BUILTINS_HOW
 case "$jobname" in
 linux-gcc)
 	make test

  reply	other threads:[~2020-08-26 16:24 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-17  9:07 [PATCH 0/3] Optionally skip linking/copying the built-ins Johannes Schindelin
2020-08-17  4:55 ` Johannes Schindelin
2020-08-17 18:02   ` Junio C Hamano
2020-08-24 12:47     ` Johannes Schindelin
2020-08-24 18:42       ` Junio C Hamano
2020-08-25  8:07         ` Johannes Schindelin
2020-08-25 16:03           ` Junio C Hamano
2020-08-17  9:07 ` [PATCH 1/3] msvc: copy the correct `.pdb` files in the Makefile target `install` Johannes Schindelin
2020-08-17  9:24   ` Jeff King
2020-08-17  5:51     ` Johannes Schindelin
2020-08-17 21:37       ` Jeff King
2020-08-18  6:17         ` Johannes Schindelin
2020-08-17  9:07 ` [PATCH 2/3] Optionally skip linking/copying the built-ins Johannes Schindelin
2020-08-17 18:19   ` Junio C Hamano
2020-08-24 14:58     ` Johannes Schindelin
2020-08-17  9:07 ` [PATCH 3/3] ci: stop linking built-ins to the dashed versions Johannes Schindelin
2020-08-17 18:26   ` Junio C Hamano
2020-08-24 15:37 ` [PATCH v2 0/3] Optionally skip linking/copying the built-ins Johannes Schindelin via GitGitGadget
2020-08-24 15:37   ` [PATCH v2 1/3] msvc: copy the correct `.pdb` files in the Makefile target `install` Johannes Schindelin via GitGitGadget
2020-08-24 15:37   ` [PATCH v2 2/3] Optionally skip linking/copying the built-ins Johannes Schindelin via GitGitGadget
2020-08-24 19:02     ` Junio C Hamano
2020-08-25  8:20       ` Johannes Schindelin
2020-08-24 15:38   ` [PATCH v2 3/3] ci: stop linking built-ins to the dashed versions Johannes Schindelin via GitGitGadget
2020-08-24 19:06     ` Junio C Hamano
2020-08-25  8:30       ` Johannes Schindelin
2020-08-25 13:47     ` SZEDER Gábor
2020-08-25 15:42       ` Junio C Hamano
2020-08-26  4:19         ` Johannes Schindelin
2020-08-26 16:13           ` Junio C Hamano
2020-08-26 16:24             ` Junio C Hamano [this message]
2020-09-02  7:06             ` Johannes Schindelin
2020-09-02 20:50               ` Junio C Hamano
2020-08-27  8:30           ` SZEDER Gábor
2020-08-24 18:55   ` [PATCH v2 0/3] Optionally skip linking/copying the built-ins Junio C Hamano
2020-08-24 19:03     ` Jeff King
2020-08-24 19:51       ` Junio C Hamano
2020-08-26 11:56   ` [PATCH v3 " Johannes Schindelin via GitGitGadget
2020-08-26 11:56     ` [PATCH v3 1/3] msvc: copy the correct `.pdb` files in the Makefile target `install` Johannes Schindelin via GitGitGadget
2020-08-26 11:56     ` [PATCH v3 2/3] Optionally skip linking/copying the built-ins Johannes Schindelin via GitGitGadget
2020-08-26 16:20       ` Junio C Hamano
2020-08-26 11:56     ` [PATCH v3 3/3] ci: stop linking built-ins to the dashed versions Johannes Schindelin via GitGitGadget
2020-09-03 10:45       ` SZEDER Gábor
2020-09-08 11:32         ` Johannes Schindelin
2020-09-08 11:48           ` SZEDER Gábor
2020-09-08 17:18           ` Junio C Hamano
2020-09-21 22:28     ` [PATCH v4 0/3] Optionally skip linking/copying the built-ins Johannes Schindelin via GitGitGadget
2020-09-21 22:28       ` [PATCH v4 1/3] msvc: copy the correct `.pdb` files in the Makefile target `install` Johannes Schindelin via GitGitGadget
2020-09-21 22:28       ` [PATCH v4 2/3] Optionally skip linking/copying the built-ins Johannes Schindelin via GitGitGadget
2020-09-21 22:28       ` [PATCH v4 3/3] ci: stop linking built-ins to the dashed versions Johannes Schindelin via GitGitGadget
2020-09-21 22:53         ` Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtuwpwf2n.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=szeder.dev@gmail.com \
    --subject='Re: [PATCH v2 3/3] ci: stop linking built-ins to the dashed versions' \
    /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

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).