git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] ci: make sure we build Git parallel
@ 2019-02-07 18:37 SZEDER Gábor
  2019-02-07 19:00 ` Junio C Hamano
  0 siblings, 1 reply; 11+ messages in thread
From: SZEDER Gábor @ 2019-02-07 18:37 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Johannes Schindelin, git, SZEDER Gábor

Commit 2c8921db2b (travis-ci: build with the right compiler,
2019-01-17) started to use MAKEFLAGS to specify which compiler to use
to build Git.  A bit later, and in a different topic branch commit
eaa62291ff (ci: inherit --jobs via MAKEFLAGS in run-build-and-tests,
2019-01-27) started to use MAKEFLAGS as well.  Unfortunately, there is
a semantic conflict between these two commits: both of them set
MAKEFLAGS, and since the line adding CC from 2c8921db2b comes later in
'ci/lib.sh', it overwrites the number of parallel jobs added in
eaa62291ff.

Consequently, since both commits have been merged all our CI jobs have
been building Git, building its documentation, and applying semantic
patches sequentially, making all build jobs a bit slower.  Running
the test suite is unaffected, because the number of test jobs comes
from GIT_PROVE_OPTS.

Append to MAKEFLAGS when setting the compiler to use, to ensure that
the number of parallel jobs to use is preserved.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---
 ci/lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/lib.sh b/ci/lib.sh
index 16f4ecbc67..cee51a4cc4 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -185,4 +185,4 @@ GIT_TEST_GETTEXT_POISON)
 	;;
 esac
 
-export MAKEFLAGS="CC=${CC:-cc}"
+export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
-- 
2.20.1.940.g8404bb2d1a


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: make sure we build Git parallel
  2019-02-07 18:37 [PATCH] ci: make sure we build Git parallel SZEDER Gábor
@ 2019-02-07 19:00 ` Junio C Hamano
  2019-02-07 19:04   ` Junio C Hamano
  0 siblings, 1 reply; 11+ messages in thread
From: Junio C Hamano @ 2019-02-07 19:00 UTC (permalink / raw)
  To: SZEDER Gábor; +Cc: Johannes Schindelin, git

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

> Append to MAKEFLAGS when setting the compiler to use, to ensure that
> the number of parallel jobs to use is preserved.
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
> ---
>  ci/lib.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ci/lib.sh b/ci/lib.sh
> index 16f4ecbc67..cee51a4cc4 100755
> --- a/ci/lib.sh
> +++ b/ci/lib.sh
> @@ -185,4 +185,4 @@ GIT_TEST_GETTEXT_POISON)
>  	;;
>  esac
>  
> -export MAKEFLAGS="CC=${CC:-cc}"
> +export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"

Makes sense.  Thanks.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: make sure we build Git parallel
  2019-02-07 19:00 ` Junio C Hamano
@ 2019-02-07 19:04   ` Junio C Hamano
  2019-02-07 19:35     ` Junio C Hamano
  0 siblings, 1 reply; 11+ messages in thread
From: Junio C Hamano @ 2019-02-07 19:04 UTC (permalink / raw)
  To: SZEDER Gábor; +Cc: Johannes Schindelin, git

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

> SZEDER Gábor <szeder.dev@gmail.com> writes:
>
>> Append to MAKEFLAGS when setting the compiler to use, to ensure that
>> the number of parallel jobs to use is preserved.
>>
>> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
>> ---
>>  ci/lib.sh | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/ci/lib.sh b/ci/lib.sh
>> index 16f4ecbc67..cee51a4cc4 100755
>> --- a/ci/lib.sh
>> +++ b/ci/lib.sh
>> @@ -185,4 +185,4 @@ GIT_TEST_GETTEXT_POISON)
>>  	;;
>>  esac
>>  
>> -export MAKEFLAGS="CC=${CC:-cc}"
>> +export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
>
> Makes sense.  Thanks.

Wouldn't all other hits of "MAKEFLAGS=" in ci/lib.sh also want the
same treatment, though?  We know that "if travis to this, otherwise
if Asure, do that" is the first block to muck with MAKEFLAGS in the
script, but a new assignment before that block can be added in the
future and cause a similar issue unless we do so.

Of course, at some point we do want to say "we do not want to
inherit it from the outside environment", but then such an
assignment of empty value should be done at the very beginning with
a comment, not with "this happens to be the first one to set, so
let's not append but assign to clear any previous value", I would
think.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: make sure we build Git parallel
  2019-02-07 19:04   ` Junio C Hamano
@ 2019-02-07 19:35     ` Junio C Hamano
  2019-02-07 22:32       ` Johannes Schindelin
  0 siblings, 1 reply; 11+ messages in thread
From: Junio C Hamano @ 2019-02-07 19:35 UTC (permalink / raw)
  To: SZEDER Gábor; +Cc: Johannes Schindelin, git

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

> Wouldn't all other hits of "MAKEFLAGS=" in ci/lib.sh also want the
> same treatment, though?  We know that "if travis to this, otherwise
> if Asure, do that" is the first block to muck with MAKEFLAGS in the
> script, but a new assignment before that block can be added in the
> future and cause a similar issue unless we do so.
>
> Of course, at some point we do want to say "we do not want to
> inherit it from the outside environment", but then such an
> assignment of empty value should be done at the very beginning with
> a comment, not with "this happens to be the first one to set, so
> let's not append but assign to clear any previous value", I would
> think.

That is, in a patch form on top of yours, something like this.


 ci/lib.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci/lib.sh b/ci/lib.sh
index cee51a4cc4..288a5b3884 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -74,6 +74,9 @@ check_unignored_build_artifacts ()
 	}
 }
 
+# Clear MAKEFLAGS that may come from the outside world.
+export MAKEFLAGS=
+
 # Set 'exit on error' for all CI scripts to let the caller know that
 # something went wrong.
 # Set tracing executed commands, primarily setting environment variables
@@ -101,7 +104,7 @@ then
 	BREW_INSTALL_PACKAGES="git-lfs gettext"
 	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
 	export GIT_TEST_OPTS="--verbose-log -x --immediate"
-	export MAKEFLAGS="--jobs=2"
+	MAKEFLAGS="$MAKEFLAGS --jobs=2"
 elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
 then
 	CI_TYPE=azure-pipelines
@@ -126,7 +129,7 @@ then
 	BREW_INSTALL_PACKAGES=gcc@8
 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
-	export MAKEFLAGS="--jobs=10"
+	MAKEFLAGS="$MAKEFLAGS --jobs=10"
 	test windows_nt != "$CI_OS_NAME" ||
 	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
 else
@@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
 	;;
 esac
 
-export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
+MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: make sure we build Git parallel
  2019-02-07 19:35     ` Junio C Hamano
@ 2019-02-07 22:32       ` Johannes Schindelin
  2019-02-07 23:33         ` Junio C Hamano
  0 siblings, 1 reply; 11+ messages in thread
From: Johannes Schindelin @ 2019-02-07 22:32 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: SZEDER Gábor, git

Hi Junio,

On Thu, 7 Feb 2019, Junio C Hamano wrote:

> Junio C Hamano <gitster@pobox.com> writes:
> 
> > Wouldn't all other hits of "MAKEFLAGS=" in ci/lib.sh also want the
> > same treatment, though?  We know that "if travis to this, otherwise
> > if Asure, do that" is the first block to muck with MAKEFLAGS in the
> > script, but a new assignment before that block can be added in the
> > future and cause a similar issue unless we do so.
> >
> > Of course, at some point we do want to say "we do not want to
> > inherit it from the outside environment", but then such an
> > assignment of empty value should be done at the very beginning with
> > a comment, not with "this happens to be the first one to set, so
> > let's not append but assign to clear any previous value", I would
> > think.
> 
> That is, in a patch form on top of yours, something like this.
> 
> 
>  ci/lib.sh | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/ci/lib.sh b/ci/lib.sh
> index cee51a4cc4..288a5b3884 100755
> --- a/ci/lib.sh
> +++ b/ci/lib.sh
> @@ -74,6 +74,9 @@ check_unignored_build_artifacts ()
>  	}
>  }
>  
> +# Clear MAKEFLAGS that may come from the outside world.
> +export MAKEFLAGS=
> +
>  # Set 'exit on error' for all CI scripts to let the caller know that
>  # something went wrong.
>  # Set tracing executed commands, primarily setting environment variables
> @@ -101,7 +104,7 @@ then
>  	BREW_INSTALL_PACKAGES="git-lfs gettext"
>  	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
>  	export GIT_TEST_OPTS="--verbose-log -x --immediate"
> -	export MAKEFLAGS="--jobs=2"
> +	MAKEFLAGS="$MAKEFLAGS --jobs=2"
>  elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
>  then
>  	CI_TYPE=azure-pipelines
> @@ -126,7 +129,7 @@ then
>  	BREW_INSTALL_PACKAGES=gcc@8
>  	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
>  	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
> -	export MAKEFLAGS="--jobs=10"
> +	MAKEFLAGS="$MAKEFLAGS --jobs=10"
>  	test windows_nt != "$CI_OS_NAME" ||
>  	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
>  else
> @@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
>  	;;
>  esac
>  
> -export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
> +MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"

Since this is intended to be run in a CI setting, there is not a whole lot
of opportunity to set `MAKEFLAGS` outside of the script. And if there is,
that might open a rabbit hole when debugging issues that somehow in the
end turn out to come from a hard-coded `MAKEFLAGS` somewhere in the CI
system.

So I'd rather clear `MAKEFLAGS` at the beginning (i.e. where you `export
MAKEFLAGS`, I'd simply append a `=`).

Ciao,
Dscho

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: make sure we build Git parallel
  2019-02-07 22:32       ` Johannes Schindelin
@ 2019-02-07 23:33         ` Junio C Hamano
  2019-02-07 23:45           ` [PATCH] ci: clear and mark MAKEFLAGS exported just once Junio C Hamano
  2019-02-08 10:10           ` [PATCH] ci: make sure we build Git parallel Johannes Schindelin
  0 siblings, 2 replies; 11+ messages in thread
From: Junio C Hamano @ 2019-02-07 23:33 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: SZEDER Gábor, git

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>>  
>> +# Clear MAKEFLAGS that may come from the outside world.
>> +export MAKEFLAGS=
>> +
>>  # Set 'exit on error' for all CI scripts to let the caller know that
>>  # something went wrong.
>>  # Set tracing executed commands, primarily setting environment variables
>> @@ -101,7 +104,7 @@ then
>>  	BREW_INSTALL_PACKAGES="git-lfs gettext"
>>  	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
>>  	export GIT_TEST_OPTS="--verbose-log -x --immediate"
>> -	export MAKEFLAGS="--jobs=2"
>> +	MAKEFLAGS="$MAKEFLAGS --jobs=2"
>>  elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
>>  then
>>  	CI_TYPE=azure-pipelines
>> @@ -126,7 +129,7 @@ then
>>  	BREW_INSTALL_PACKAGES=gcc@8
>>  	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
>>  	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
>> -	export MAKEFLAGS="--jobs=10"
>> +	MAKEFLAGS="$MAKEFLAGS --jobs=10"
>>  	test windows_nt != "$CI_OS_NAME" ||
>>  	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
>>  else
>> @@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
>>  	;;
>>  esac
>>  
>> -export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
>> +MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
>
> Since this is intended to be run in a CI setting, there is not a whole lot
> of opportunity to set `MAKEFLAGS` outside of the script. And if there is,
> that might open a rabbit hole when debugging issues that somehow in the
> end turn out to come from a hard-coded `MAKEFLAGS` somewhere in the CI
> system.
>
> So I'd rather clear `MAKEFLAGS` at the beginning (i.e. where you `export
> MAKEFLAGS`, I'd simply append a `=`).

I meant to clear it at the beginning, where I "export MAKEFLAGS=".
Did your MUA ate the equal sign at the end, mistaking it with part
of text/plain; format=flawed or something?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH] ci: clear and mark MAKEFLAGS exported just once
  2019-02-07 23:33         ` Junio C Hamano
@ 2019-02-07 23:45           ` Junio C Hamano
  2019-02-08  0:17             ` SZEDER Gábor
  2019-02-08 10:10           ` [PATCH] ci: make sure we build Git parallel Johannes Schindelin
  1 sibling, 1 reply; 11+ messages in thread
From: Junio C Hamano @ 2019-02-07 23:45 UTC (permalink / raw)
  To: git; +Cc: SZEDER Gábor, Johannes Schindelin

Clearing it once upfront, and turning all the assignment into
appending, would future-proof the code even more, to prevent
mistakes the previous one fixed from happening again.

Also, mark the variable exported just once at the beginning.  There
is no point in marking it exported repeatedly.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
    >> So I'd rather clear `MAKEFLAGS` at the beginning (i.e. where you `export
    >> MAKEFLAGS`, I'd simply append a `=`).

    This time in proper patch form.

 ci/lib.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci/lib.sh b/ci/lib.sh
index cee51a4cc4..288a5b3884 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -74,6 +74,9 @@ check_unignored_build_artifacts ()
 	}
 }
 
+# Clear MAKEFLAGS that may come from the outside world.
+export MAKEFLAGS=
+
 # Set 'exit on error' for all CI scripts to let the caller know that
 # something went wrong.
 # Set tracing executed commands, primarily setting environment variables
@@ -101,7 +104,7 @@ then
 	BREW_INSTALL_PACKAGES="git-lfs gettext"
 	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
 	export GIT_TEST_OPTS="--verbose-log -x --immediate"
-	export MAKEFLAGS="--jobs=2"
+	MAKEFLAGS="$MAKEFLAGS --jobs=2"
 elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
 then
 	CI_TYPE=azure-pipelines
@@ -126,7 +129,7 @@ then
 	BREW_INSTALL_PACKAGES=gcc@8
 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
-	export MAKEFLAGS="--jobs=10"
+	MAKEFLAGS="$MAKEFLAGS --jobs=10"
 	test windows_nt != "$CI_OS_NAME" ||
 	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
 else
@@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
 	;;
 esac
 
-export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
+MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
-- 
2.21.0-rc0


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: clear and mark MAKEFLAGS exported just once
  2019-02-07 23:45           ` [PATCH] ci: clear and mark MAKEFLAGS exported just once Junio C Hamano
@ 2019-02-08  0:17             ` SZEDER Gábor
  2019-02-08 10:11               ` Johannes Schindelin
  0 siblings, 1 reply; 11+ messages in thread
From: SZEDER Gábor @ 2019-02-08  0:17 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Johannes Schindelin

On Thu, Feb 07, 2019 at 03:45:46PM -0800, Junio C Hamano wrote:
> Clearing it once upfront, and turning all the assignment into
> appending, would future-proof the code even more, to prevent
> mistakes the previous one fixed from happening again.
> 
> Also, mark the variable exported just once at the beginning.  There
> is no point in marking it exported repeatedly.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>     >> So I'd rather clear `MAKEFLAGS` at the beginning (i.e. where you `export
>     >> MAKEFLAGS`, I'd simply append a `=`).
> 
>     This time in proper patch form.

Makes sense, and the patch looks good to me.

>  ci/lib.sh | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/ci/lib.sh b/ci/lib.sh
> index cee51a4cc4..288a5b3884 100755
> --- a/ci/lib.sh
> +++ b/ci/lib.sh
> @@ -74,6 +74,9 @@ check_unignored_build_artifacts ()
>  	}
>  }
>  
> +# Clear MAKEFLAGS that may come from the outside world.
> +export MAKEFLAGS=
> +
>  # Set 'exit on error' for all CI scripts to let the caller know that
>  # something went wrong.
>  # Set tracing executed commands, primarily setting environment variables
> @@ -101,7 +104,7 @@ then
>  	BREW_INSTALL_PACKAGES="git-lfs gettext"
>  	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
>  	export GIT_TEST_OPTS="--verbose-log -x --immediate"
> -	export MAKEFLAGS="--jobs=2"
> +	MAKEFLAGS="$MAKEFLAGS --jobs=2"
>  elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
>  then
>  	CI_TYPE=azure-pipelines
> @@ -126,7 +129,7 @@ then
>  	BREW_INSTALL_PACKAGES=gcc@8
>  	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
>  	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
> -	export MAKEFLAGS="--jobs=10"
> +	MAKEFLAGS="$MAKEFLAGS --jobs=10"
>  	test windows_nt != "$CI_OS_NAME" ||
>  	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
>  else
> @@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
>  	;;
>  esac
>  
> -export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
> +MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
> -- 
> 2.21.0-rc0
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: make sure we build Git parallel
  2019-02-07 23:33         ` Junio C Hamano
  2019-02-07 23:45           ` [PATCH] ci: clear and mark MAKEFLAGS exported just once Junio C Hamano
@ 2019-02-08 10:10           ` Johannes Schindelin
  2019-02-08 17:25             ` Junio C Hamano
  1 sibling, 1 reply; 11+ messages in thread
From: Johannes Schindelin @ 2019-02-08 10:10 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: SZEDER Gábor, git

Hi Junio,

On Thu, 7 Feb 2019, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> >>  
> >> +# Clear MAKEFLAGS that may come from the outside world.
> >> +export MAKEFLAGS=
> >> +
> >>  # Set 'exit on error' for all CI scripts to let the caller know that
> >>  # something went wrong.
> >>  # Set tracing executed commands, primarily setting environment variables
> >> @@ -101,7 +104,7 @@ then
> >>  	BREW_INSTALL_PACKAGES="git-lfs gettext"
> >>  	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
> >>  	export GIT_TEST_OPTS="--verbose-log -x --immediate"
> >> -	export MAKEFLAGS="--jobs=2"
> >> +	MAKEFLAGS="$MAKEFLAGS --jobs=2"
> >>  elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
> >>  then
> >>  	CI_TYPE=azure-pipelines
> >> @@ -126,7 +129,7 @@ then
> >>  	BREW_INSTALL_PACKAGES=gcc@8
> >>  	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
> >>  	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
> >> -	export MAKEFLAGS="--jobs=10"
> >> +	MAKEFLAGS="$MAKEFLAGS --jobs=10"
> >>  	test windows_nt != "$CI_OS_NAME" ||
> >>  	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
> >>  else
> >> @@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
> >>  	;;
> >>  esac
> >>  
> >> -export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
> >> +MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
> >
> > Since this is intended to be run in a CI setting, there is not a whole lot
> > of opportunity to set `MAKEFLAGS` outside of the script. And if there is,
> > that might open a rabbit hole when debugging issues that somehow in the
> > end turn out to come from a hard-coded `MAKEFLAGS` somewhere in the CI
> > system.
> >
> > So I'd rather clear `MAKEFLAGS` at the beginning (i.e. where you `export
> > MAKEFLAGS`, I'd simply append a `=`).
> 
> I meant to clear it at the beginning, where I "export MAKEFLAGS=".
> Did your MUA ate the equal sign at the end, mistaking it with part
> of text/plain; format=flawed or something?

I could have sworn that there was no equal sign yesterday.

Sorry for the noise,
Dscho

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: clear and mark MAKEFLAGS exported just once
  2019-02-08  0:17             ` SZEDER Gábor
@ 2019-02-08 10:11               ` Johannes Schindelin
  0 siblings, 0 replies; 11+ messages in thread
From: Johannes Schindelin @ 2019-02-08 10:11 UTC (permalink / raw)
  To: SZEDER Gábor; +Cc: Junio C Hamano, git

[-- Attachment #1: Type: text/plain, Size: 2304 bytes --]

Hi,

On Fri, 8 Feb 2019, SZEDER Gábor wrote:

> On Thu, Feb 07, 2019 at 03:45:46PM -0800, Junio C Hamano wrote:
> > Clearing it once upfront, and turning all the assignment into
> > appending, would future-proof the code even more, to prevent
> > mistakes the previous one fixed from happening again.
> > 
> > Also, mark the variable exported just once at the beginning.  There
> > is no point in marking it exported repeatedly.
> > 
> > Signed-off-by: Junio C Hamano <gitster@pobox.com>
> > ---
> >     >> So I'd rather clear `MAKEFLAGS` at the beginning (i.e. where
> >     >> you `export MAKEFLAGS`, I'd simply append a `=`).
> > 
> >     This time in proper patch form.
> 
> Makes sense, and the patch looks good to me.

To me, too.

Thank you,
Dscho

> 
> >  ci/lib.sh | 9 ++++++---
> >  1 file changed, 6 insertions(+), 3 deletions(-)
> > 
> > diff --git a/ci/lib.sh b/ci/lib.sh
> > index cee51a4cc4..288a5b3884 100755
> > --- a/ci/lib.sh
> > +++ b/ci/lib.sh
> > @@ -74,6 +74,9 @@ check_unignored_build_artifacts ()
> >  	}
> >  }
> >  
> > +# Clear MAKEFLAGS that may come from the outside world.
> > +export MAKEFLAGS=
> > +
> >  # Set 'exit on error' for all CI scripts to let the caller know that
> >  # something went wrong.
> >  # Set tracing executed commands, primarily setting environment variables
> > @@ -101,7 +104,7 @@ then
> >  	BREW_INSTALL_PACKAGES="git-lfs gettext"
> >  	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
> >  	export GIT_TEST_OPTS="--verbose-log -x --immediate"
> > -	export MAKEFLAGS="--jobs=2"
> > +	MAKEFLAGS="$MAKEFLAGS --jobs=2"
> >  elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
> >  then
> >  	CI_TYPE=azure-pipelines
> > @@ -126,7 +129,7 @@ then
> >  	BREW_INSTALL_PACKAGES=gcc@8
> >  	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
> >  	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
> > -	export MAKEFLAGS="--jobs=10"
> > +	MAKEFLAGS="$MAKEFLAGS --jobs=10"
> >  	test windows_nt != "$CI_OS_NAME" ||
> >  	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
> >  else
> > @@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
> >  	;;
> >  esac
> >  
> > -export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
> > +MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
> > -- 
> > 2.21.0-rc0
> > 
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ci: make sure we build Git parallel
  2019-02-08 10:10           ` [PATCH] ci: make sure we build Git parallel Johannes Schindelin
@ 2019-02-08 17:25             ` Junio C Hamano
  0 siblings, 0 replies; 11+ messages in thread
From: Junio C Hamano @ 2019-02-08 17:25 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: SZEDER Gábor, git

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Thu, 7 Feb 2019, Junio C Hamano wrote:
>
>> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> 
>> >>  
>> >> +# Clear MAKEFLAGS that may come from the outside world.
>> >> +export MAKEFLAGS=
>> >> +
>> ...
>> I meant to clear it at the beginning, where I "export MAKEFLAGS=".
>> Did your MUA ate the equal sign at the end, mistaking it with part
>> of text/plain; format=flawed or something?
>
> I could have sworn that there was no equal sign yesterday.
>
> Sorry for the noise,

Don't be.  Mistakes happen and watching stupid mistakes for each
other is part of the teamwork I very much appreciate.

Will apply on top of Szeder's fix.  Thanks.

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2019-02-08 17:25 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-07 18:37 [PATCH] ci: make sure we build Git parallel SZEDER Gábor
2019-02-07 19:00 ` Junio C Hamano
2019-02-07 19:04   ` Junio C Hamano
2019-02-07 19:35     ` Junio C Hamano
2019-02-07 22:32       ` Johannes Schindelin
2019-02-07 23:33         ` Junio C Hamano
2019-02-07 23:45           ` [PATCH] ci: clear and mark MAKEFLAGS exported just once Junio C Hamano
2019-02-08  0:17             ` SZEDER Gábor
2019-02-08 10:11               ` Johannes Schindelin
2019-02-08 10:10           ` [PATCH] ci: make sure we build Git parallel Johannes Schindelin
2019-02-08 17:25             ` Junio C Hamano

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).