diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:08 -0700 |
| commit | 573ce039f3147d381c81201070ae48b8651e7dda (patch) | |
| tree | 7837ac131d839517d2168a2ef87f599a5928624c | |
| parent | 38e79b1fdab9244e1727d0698afcf3bb8956c0a4 (diff) | |
| parent | 3c93b82920506a62ebdf3b6453d91b44aae0be97 (diff) | |
| download | git-573ce039f3147d381c81201070ae48b8651e7dda.tar.gz | |
Merge branch 'sg/travis-build-during-script-phase' into maint
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
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | ci/run-build-and-tests.sh (renamed from ci/run-tests.sh) | 4 | ||||
| -rwxr-xr-x | ci/run-build.sh | 8 |
3 files changed, 4 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 4684b3f4f3..5f5ee4f3bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,6 @@ matrix: compiler: addons: before_install: - before_script: script: - > test "$TRAVIS_REPO_SLUG" != "git/git" || @@ -46,7 +45,6 @@ matrix: services: - docker before_install: - before_script: script: ci/run-linux32-docker.sh - env: jobname=StaticAnalysis os: linux @@ -56,7 +54,6 @@ matrix: packages: - coccinelle before_install: - before_script: script: ci/run-static-analysis.sh after_failure: - env: jobname=Documentation @@ -68,13 +65,11 @@ matrix: - asciidoc - xmlto before_install: - before_script: script: ci/test-documentation.sh after_failure: before_install: ci/install-dependencies.sh -before_script: ci/run-build.sh -script: ci/run-tests.sh +script: ci/run-build-and-tests.sh after_failure: ci/print-test-failures.sh notifications: diff --git a/ci/run-tests.sh b/ci/run-build-and-tests.sh index 22355f0091..d3a094603f 100755 --- a/ci/run-tests.sh +++ b/ci/run-build-and-tests.sh @@ -1,11 +1,13 @@ #!/bin/sh # -# Test Git +# Build and test Git # . ${0%/*}/lib-travisci.sh ln -s $HOME/travis-cache/.prove t/.prove + +make --jobs=2 make --quiet test check_unignored_build_artifacts 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 |