From: Patrick Steinhardt Date: Mon, 02 Nov 2026 11:17:51 GMT Subject: [PATCH v2 3/7] ci/lib: deduplicate test variables by pattern matching Message-ID: <20261102-b4-pks-ci-test-vars-consolidation-v2-3-a5485c437c62@pks.im> In-Reply-To: <20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im> We have a couple of test variables that we set in multiple different jobs. These jobs always have specific identifiers in their names and can thus easily be told apart from the other jobs. Use this fact to deduplicate the setup of those test variables by pattern matching for those identifiers. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 560d785f67c..de4b94d4d33 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -373,6 +373,25 @@ linux) ;; esac +case "$jobname" in +*breaking-changes*) + export WITH_BREAKING_CHANGES=YesPlease + MESONFLAGS="$MESONFLAGS -Dbreaking_changes=true" + ;; +esac + +case "$jobname" in +*reftable*) + export GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable + ;; +esac + +case "$jobname" in +*sha256*) + export GIT_TEST_DEFAULT_HASH=sha256 + ;; +esac + case "$jobname" in linux32) CC=gcc @@ -407,10 +426,6 @@ linux-musl-meson) esac case "$jobname" in -fedora-breaking-changes-meson|linux-breaking-changes) - export WITH_BREAKING_CHANGES=YesPlease - MESONFLAGS="$MESONFLAGS -Dbreaking_changes=true" - ;; linux-feature-testbed) export OPENSSL_SHA1_UNSAFE=YesPlease export GIT_TEST_SPLIT_INDEX=yes @@ -426,16 +441,6 @@ linux-feature-testbed) export GIT_TEST_CHECKOUT_WORKERS=2 export GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1 ;; -linux-sha256) - export GIT_TEST_DEFAULT_HASH=sha256 - ;; -linux-reftable-sha256) - export GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable - export GIT_TEST_DEFAULT_HASH=sha256 - ;; -linux-reftable-leaks|osx-reftable) - export GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable - ;; esac MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" -- 2.56.0.500.g5d06dc02cd.dirty