Merge branch 'sg/travis-build-during-script-phase'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 20:36:23 +0000 (12:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 20:36:23 +0000 (12:36 -0800)
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

.travis.yml
ci/run-build-and-tests.sh [moved from ci/run-tests.sh with 87% similarity]
ci/run-build.sh [deleted file]

index 4684b3f..5f5ee4f 100644 (file)
@@ -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:
similarity index 87%
rename from ci/run-tests.sh
rename to ci/run-build-and-tests.sh
index 73e273f..3735ce4 100755 (executable)
@@ -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 (executable)
index 4f940d1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# Build Git
-#
-
-. ${0%/*}/lib-travisci.sh
-
-make --jobs=2