dilim/git
1
0 Fork 0
mirror of https://github.com/git/git.git synced 2026-11-06 05:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: consolidate setup of test environment

Browse Source 
The setup of our test environment is split up across "ci/lib.sh" and
"ci/run-build-and-tests.sh". It is not exactly obvious why that split
even exists, and because of the split you have to know about both of the
locations to be able to figure out the specific environment that applies
to a specific job.

Consolidate the setup into "ci/lib.sh". Note that this is a pure move
for now that results in some awkward duplication. This duplication will
be cleaned up in subsequent commits.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt authored and Junio C Hamano committed 2026-11-02 07:30:56 -08:00
1 parent 37b3475fb5
commit c24deacf48
2 files changed
+43 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ci/lib.sh
+43
View File
@@ -394,7 +394,50 @@ osx-meson)
;;
esac
case "$jobname" in
linux-musl-meson)
MESONFLAGS="$MESONFLAGS -Drust=disabled"
export GIT_TEST_USE_SET_E=yes
;;
almalinux-*|debian-*|fedora-*|linux-*)
export GIT_TEST_USE_SET_E=yes
;;
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
export GIT_TEST_FULL_IN_PACK_ARRAY=true
export GIT_TEST_OE_SIZE=10
export GIT_TEST_OE_DELTA_SIZE=5
export GIT_TEST_COMMIT_GRAPH=1
export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
export GIT_TEST_MULTI_PACK_INDEX=1
export GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_NO_WRITE_REV_INDEX=1
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}"
export TEST_CONTRIB_TOO=yes
end_group "CI setup via $(basename $0)"
set -x
ci/run-build-and-tests.sh
-44
View File
@@ -5,50 +5,6 @@
. ${0%/*}/lib.sh
export TEST_CONTRIB_TOO=yes
case "$jobname" in
linux-musl-meson)
MESONFLAGS="$MESONFLAGS -Drust=disabled"
export GIT_TEST_USE_SET_E=yes
;;
almalinux-*|debian-*|fedora-*|linux-*)
export GIT_TEST_USE_SET_E=yes
;;
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
export GIT_TEST_FULL_IN_PACK_ARRAY=true
export GIT_TEST_OE_SIZE=10
export GIT_TEST_OE_DELTA_SIZE=5
export GIT_TEST_COMMIT_GRAPH=1
export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
export GIT_TEST_MULTI_PACK_INDEX=1
export GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_NO_WRITE_REV_INDEX=1
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
case "$jobname" in
*-meson)
group "Configure" meson setup build . \