[v3,11/29] CI: consistently use "export" in ci/lib.sh

Message ID	patch-v3-11.29-8ab4e81e1ca-20220413T194847Z-avarab@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>, =?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>, =?utf-8?b?xJBvw6Bu?= =?utf-8?b?IFRy4bqnbiBDw7RuZyBEYW5o?= <congdanhqx@gmail.com>, =?utf-8?q?Car?= =?utf-8?q?lo_Marcelo_Arenas_Bel=C3=B3n?= <carenas@gmail.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, Victoria Dye <vdye@github.com>, Matheus Tavares <matheus.bernardino@usp.br>, Lars Schneider <larsxschneider@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= <avarab@gmail.com> Subject: [PATCH v3 11/29] CI: consistently use "export" in ci/lib.sh Date: Wed, 13 Apr 2022 21:51:24 +0200 Message-Id: <patch-v3-11.29-8ab4e81e1ca-20220413T194847Z-avarab@gmail.com> In-Reply-To: <cover-v3-00.29-00000000000-20220413T194847Z-avarab@gmail.com> References: <cover-v2-00.25-00000000000-20220325T182534Z-avarab@gmail.com> <cover-v3-00.29-00000000000-20220413T194847Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	CI: run "make" in CI "steps", improve UX \| expand [v3,00/29] CI: run "make" in CI "steps", improve UX [v3,01/29] CI: run "set -ex" early in ci/lib.sh [v3,02/29] CI: make "$jobname" explicit, remove fallback [v3,03/29] CI: remove more dead Travis CI support [v3,04/29] CI: remove dead "tree skipping" code [v3,05/29] CI: remove unused Azure ci/* code [v3,06/29] CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS [v3,07/29] CI: don't have "git grep" invoke a pager in tree content check [v3,08/29] CI: have "static-analysis" run a "make ci-static-analysis" target [v3,09/29] CI: have "static-analysis" run "check-builtins", not "documentation" [v3,10/29] CI: move p4 and git-lfs variables to ci/install-dependencies.sh [v3,11/29] CI: consistently use "export" in ci/lib.sh [v3,12/29] CI: export variables via a wrapper [v3,13/29] CI: remove "run-build-and-tests.sh", run "make [test]" directly [v3,14/29] ci/lib.sh: use "test" instead of "[" [v3,15/29] CI: check ignored unignored build artifacts in "win[+VS] build" too [v3,16/29] CI: invoke "make artifacts-tar" directly in windows-build [v3,17/29] CI: split up and reduce "ci/test-documentation.sh" [v3,18/29] CI: combine ci/install{,-docker}-dependencies.sh [v3,19/29] CI: move "env" definitions into ci/lib.sh [v3,20/29] ci/run-test-slice.sh: replace shelling out with "echo" [v3,21/29] CI: pre-select test slice in Windows & VS tests [v3,22/29] CI: only invoke ci/lib.sh as "steps" in main.yml [v3,23/29] CI: narrow down variable definitions in --build and --test [v3,24/29] CI: add more variables to MAKEFLAGS, except under vs-build [v3,25/29] CI: set CC in MAKEFLAGS directly, don't add it to the environment [v3,26/29] CI: set SANITIZE=leak in MAKEFLAGS directly [v3,27/29] CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case [v3,28/29] CI: don't use "set -x" in "ci/lib.sh" output [v3,29/29] CI: make it easy to use ci/*.sh outside of CI

Message ID

patch-v3-11.29-8ab4e81e1ca-20220413T194847Z-avarab@gmail.com (mailing list archive)

State

Superseded

Headers

From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?=  <avarab@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>,
	=?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>, =?utf-8?b?xJBvw6Bu?=
	=?utf-8?b?IFRy4bqnbiBDw7RuZyBEYW5o?=  <congdanhqx@gmail.com>, =?utf-8?q?Car?=
	=?utf-8?q?lo_Marcelo_Arenas_Bel=C3=B3n?=  <carenas@gmail.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>,
 Victoria Dye <vdye@github.com>, Matheus Tavares <matheus.bernardino@usp.br>,
 Lars Schneider <larsxschneider@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?=
	=?utf-8?b?w7AgQmphcm1hc29u?=  <avarab@gmail.com>
Subject: [PATCH v3 11/29] CI: consistently use "export" in ci/lib.sh
Date: Wed, 13 Apr 2022 21:51:24 +0200
Message-Id: <patch-v3-11.29-8ab4e81e1ca-20220413T194847Z-avarab@gmail.com>
In-Reply-To: <cover-v3-00.29-00000000000-20220413T194847Z-avarab@gmail.com>
References: <cover-v2-00.25-00000000000-20220325T182534Z-avarab@gmail.com>
 <cover-v3-00.29-00000000000-20220413T194847Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

CI: run "make" in CI "steps", improve UX | expand

Commit Message

Ævar Arnfjörð Bjarmason April 13, 2022, 7:51 p.m. UTC

Change the "ci/lib.sh" script co 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 (to
additionally 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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/lib.sh b/ci/lib.sh
index 5736a4d2e04..5783eed1b20 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -30,7 +30,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 "$GITHUB_ACTIONS" = "true"
 then
@@ -38,9 +38,10 @@  then
 	CC="${CC:-gcc}"
 
 	export GIT_PROVE_OPTS="--timer --jobs $NPROC"
-	export GIT_TEST_OPTS="--verbose-log -x"
+	GIT_TEST_OPTS="--verbose-log -x"
 	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
@@ -94,4 +95,4 @@  linux-leaks)
 	;;
 esac
 
-MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
+export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"

[v3,11/29] CI: consistently use "export" in ci/lib.sh

Commit Message

Patch