Web lists-archives.com

Re: [PATCH] ci: make sure we build Git parallel




Hi Junio,

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

> Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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