build,travis: do not modify .travis.yml

restarting a build doesn't update .travis.yml but does update .travis_do.sh ...

Signed-off-by: Etienne Champetier <redacted>

diff --git a/.travis.yml b/.travis.yml
index ec74c3683fbf0aa6e4b8f71e7f957381f421c3d2..773a3511267e653964753b670e8d52e120f2f7a1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,4 @@ before_script:
   - ./.travis_do.sh download_sdk
 
 script:
-  - ./.travis_do.sh test_commits
   - ./.travis_do.sh test_packages

diff --git a/.travis_do.sh b/.travis_do.sh
index f2fc9c6038bfe440bec8517327bcfbf63626dfc1..5a7a086e0c2115cdb3fd5dc68ce2e280b0ebb12b 100755 (executable)
--- a/.travis_do.sh
+++ b/.travis_do.sh
@@ -55,9 +55,8 @@ download_sdk() {
 }
 
 # test_package will run on the `script` step.
-# test_package call make download check for very new/modified package in it's
-# own clean sdk directory
-test_packages() {
+# test_package call make download check for very new/modified package
+test_packages2() {
        # search for new or modified packages. PKGS will hold a list of package like 'admin/muninlite admin/monit ...'
        PKGS=$(git diff --name-only "$TRAVIS_COMMIT_RANGE" | grep 'Makefile$' | grep -v '/files/' | awk -F'/Makefile' '{ print $1 }')
 
@@ -101,7 +100,7 @@ EOF
                echo_blue "=== $pkg_name Finished package"
        done
 
-       exit $RET
+       return $RET
 }
 
 test_commits() {
@@ -139,7 +138,14 @@ test_commits() {
                fi
        done
 
-       exit $RET
+       return $RET
+}
+
+test_packages() {
+       GRET=0
+       test_commits   || GRET=1
+       test_packages2 || GRET=1
+       return $GRET
 }
 
 echo_blue "=== Travis ENV"