[PATCH v2 13/13] Add testing with merge-ort merge strategy
flat view
STALE2029d
From: Elijah Newren via GitGitGadget <hidden>
Date: 2021-03-17 21:28:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 2 in this series.
Revisions (2)
- v2 current
- v3 [diff vs current]
From: Elijah Newren <redacted> In preparation for switching from merge-recursive to merge-ort as the default strategy, ensure that we are testing it. Signed-off-by: Elijah Newren <redacted> --- .github/workflows/main.yml | 1 + ci/lib.sh | 6 ++++++ 2 files changed, 7 insertions(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5f2f884b92f6..e1f59861a2ca 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml@@ -252,6 +252,7 @@ jobs: MSYSTEM: MINGW64 NO_SVN_TESTS: 1 GIT_TEST_SKIP_REBASE_P: 1 + GIT_TEST_MERGE_ALGORITHM: ort run: | & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" # Let Git ignore the SDK and the test-cache
diff --git a/ci/lib.sh b/ci/lib.sh
index d848c036c50f..2a869b598c7f 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh@@ -182,6 +182,12 @@ export DEFAULT_TEST_TARGET=prove export GIT_TEST_CLONE_2GB=true export SKIP_DASHED_BUILT_INS=YesPlease +case "$jobname" in +*-gcc) + export GIT_TEST_MERGE_ALGORITHM=ort + ;; +esac + case "$jobname" in linux-clang|linux-gcc) if [ "$jobname" = linux-gcc ]
--
gitgitgadget