Skip to content

Commit

Permalink
Merge branch 'sg/travis-build-during-script-phase'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Mar 8, 2018
2 parents c6284da + 3c93b82 commit c710d18
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ matrix:
compiler:
addons:
before_install:
before_script:
script:
- >
test "$TRAVIS_REPO_SLUG" != "git/git" ||
Expand All @@ -46,7 +45,6 @@ matrix:
services:
- docker
before_install:
before_script:
script: ci/run-linux32-docker.sh
- env: jobname=StaticAnalysis
os: linux
Expand All @@ -56,7 +54,6 @@ matrix:
packages:
- coccinelle
before_install:
before_script:
script: ci/run-static-analysis.sh
after_failure:
- env: jobname=Documentation
Expand All @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion ci/run-tests.sh → ci/run-build-and-tests.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 0 additions & 8 deletions ci/run-build.sh

This file was deleted.

0 comments on commit c710d18

Please sign in to comment.