1
0
mirror of https://github.com/git/git.git synced 2024-09-28 16:13:01 +02:00
git/ci
Elijah Newren f3b964a07e Add testing with merge-ort merge strategy
In preparation for switching from merge-recursive to merge-ort as the
default strategy, have the testsuite default to running with merge-ort.
Keep coverage of the recursive backend by having the linux-gcc job run
with it.

Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-03-20 12:35:40 -07:00
..
config ci/config: correct instruction for CI preferences 2020-05-18 10:18:34 -07:00
util travis-ci: include the trash directories of failed tests in the trace log 2018-08-01 09:59:36 -07:00
install-dependencies.sh Merge branch 'ab/detox-gettext-tests' 2021-02-10 14:48:33 -08:00
install-docker-dependencies.sh travis: build and test on Linux with musl libc and busybox 2020-04-06 13:44:42 -07:00
lib.sh ci: remove GETTEXT_POISON jobs 2021-01-21 15:50:00 -08:00
make-test-artifacts.sh ci: parallelize testing on Windows 2019-01-29 09:26:47 -08:00
mount-fileshare.sh Add a build definition for Azure DevOps 2019-01-29 09:26:46 -08:00
print-test-failures.sh ci: avoid set-env construct in print-test-failures.sh 2020-11-17 12:12:30 -08:00
run-build-and-tests.sh Add testing with merge-ort merge strategy 2021-03-20 12:35:40 -07:00
run-docker-build.sh travis: build and test on Linux with musl libc and busybox 2020-04-06 13:44:42 -07:00
run-docker.sh travis: build and test on Linux with musl libc and busybox 2020-04-06 13:44:42 -07:00
run-static-analysis.sh ci: run hdr-check as part of the Static Analysis job 2019-10-03 10:34:57 +09:00
run-test-slice.sh ci: parallelize testing on Windows 2019-01-29 09:26:47 -08:00
test-documentation.sh ci: ignore rubygems warning in the "Documentation" job 2020-02-10 09:52:27 -08:00