diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-08 23:36:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-08 23:36:23 +0300 |
| commit | c710d182ea6d3846f6f2dc6f1b6c7dbd35c2fce8 (patch) | |
| tree | 7a99759b9628f9391c13683f354e7cedf88c292b /ci | |
| parent | c6284da4ff4afbde8211efe5d03f3604b1c6b9d6 (diff) | |
| parent | 3c93b82920506a62ebdf3b6453d91b44aae0be97 (diff) | |
Merge branch 'sg/travis-build-during-script-phase'
Build the executable in 'script' phase in Travis CI integration, to
follow the established practice, rather than during 'before_script'
phase. This allows the CI categorize the failures better ('failed'
is project's fault, 'errored' is build environment's).
* sg/travis-build-during-script-phase:
travis-ci: build Git during the 'script' phase
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run-build-and-tests.sh (renamed from ci/run-tests.sh) | 3 | ||||
| -rwxr-xr-x | ci/run-build.sh | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/ci/run-tests.sh b/ci/run-build-and-tests.sh index 73e273fac7..3735ce413f 100755 --- a/ci/run-tests.sh +++ b/ci/run-build-and-tests.sh @@ -1,12 +1,13 @@ #!/bin/sh # -# Test Git +# Build and test Git # . ${0%/*}/lib-travisci.sh ln -s "$cache_dir/.prove" t/.prove +make --jobs=2 make --quiet test if test "$jobname" = "linux-gcc" then diff --git a/ci/run-build.sh b/ci/run-build.sh deleted file mode 100755 index 4f940d1032..0000000000 --- a/ci/run-build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# Build Git -# - -. ${0%/*}/lib-travisci.sh - -make --jobs=2 |