[PATCH v2 22/25] CI: add more variables to MAKEFLAGS, except under vs-build
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Mar 25, 2022, 18:38 UTC
- Message-ID
- <patch-v2-22.25-5f56b922e08-20220325T182534Z-avarab@gmail.com>
- In-Reply-To
- <cover-v2-00.25-00000000000-20220325T182534Z-avarab@gmail.com>
It's clearer that "DEVELOPER" is a flag that affects the Makefile itself in particular if it's put into "MAKEFLAGS than" if it generically sits in the environment. Let's move both it and "SKIP_DASHED_BUILT_INS" to "MAKEFLAGS".
We can't do this under vs-build, since that invokes cmake. Let's have only that job set these in the environment.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- ci/lib.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/ci/lib.sh b/ci/lib.sh index 367d1ee05d5..475e9f63a74 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -55,6 +55,13 @@ setenv () { # Clear MAKEFLAGS that may come from the outside world. MAKEFLAGS= +# Common make and cmake build options +DEVELOPER=1 +SKIP_DASHED_BUILT_INS=YesPlease + +# Use common options for "make" (cmake in "vs-build" below) +MAKEFLAGS="DEVELOPER=$DEVELOPER SKIP_DASHED_BUILT_INS=$SKIP_DASHED_BUILT_INS" + case "$CI_TYPE" in github-actions) CC="${CC:-gcc}" @@ -73,10 +80,8 @@ github-actions) ;; esac -setenv --build DEVELOPER 1 setenv --test DEFAULT_TEST_TARGET prove setenv --test GIT_TEST_CLONE_2GB true -setenv --build SKIP_DASHED_BUILT_INS YesPlease case "$runs_on_pool" in ubuntu-latest) @@ -110,6 +115,9 @@ windows-build) setenv --build ARTIFACTS_DIRECTORY artifacts ;; vs-build) + setenv --build DEVELOPER $DEVELOPER + setenv --build SKIP_DASHED_BUILT_INS $SKIP_DASHED_BUILT_INS + setenv --build NO_PERL NoThanks setenv --build NO_GETTEXT NoThanks setenv --build ARTIFACTS_DIRECTORY artifacts
-- 2.35.1.1517.g20a06c426a7