[PATCH 06/10] CI: consistently use "export" in ci/lib.sh
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jul 14, 2022, 19:39 UTC
- Message-ID
- <patch-06.10-7cbf8191105-20220714T193808Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.10-00000000000-20220714T193808Z-avarab@gmail.com>
Change the "ci/lib.sh" script to consistently use "export", for e.g. MAKEFLAGS we were exporting it, and then assigning to it, let's do it the other way around.
Right now this doesn't matter, since we in e.g. "ci/install-dependencies.sh" source this file, and don't use something like "env(1)" to retrieve these variables.
But in a subsequent commit we'll "export" these variables through a wrapper (and to eventually write them to a GitHub CI-specific $GITHUB_ENV file). This change makes that subsequent change easier to read, as it won't need to do any control flow refactoring.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- ci/lib.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ci/lib.sh b/ci/lib.sh index 3591919ba44..44039152ebc 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -79,7 +79,7 @@ export TERM=${TERM:-dumb} NPROC=10 # Clear MAKEFLAGS that may come from the outside world. -export MAKEFLAGS=--jobs=$NPROC +MAKEFLAGS=--jobs=$NPROC if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI" then @@ -88,9 +88,10 @@ then CC="${CC:-gcc}" export GIT_PROVE_OPTS="--timer --jobs $NPROC --state=failed,slow,save" - export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml" + GIT_TEST_OPTS="--verbose-log -x --write-junit-xml" test Windows_NT != "$AGENT_OS" || GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" + export GIT_TEST_OPTS elif test true = "$GITHUB_ACTIONS" then CI_TYPE=github-actions @@ -118,9 +119,10 @@ then } export GIT_PROVE_OPTS="--timer --jobs $NPROC" - export GIT_TEST_OPTS="--verbose-log -x --github-workflow-markup" + GIT_TEST_OPTS="--verbose-log -x --github-workflow-markup" test Windows != "$RUNNER_OS" || GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" + export GIT_TEST_OPTS else echo "Could not identify CI type" >&2 env >&2 @@ -187,6 +189,7 @@ linux-leaks) esac MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" +export MAKEFLAGS end_group set -x
-- 2.37.1.996.g651fc6e809f