]> source.dussan.org Git - sonarqube.git/commitdiff
Silent cancelation of branch build on Travis if a PR is open
authorStas Vilchik <stas.vilchik@sonarsource.com>
Thu, 23 Nov 2017 14:10:55 +0000 (15:10 +0100)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Fri, 24 Nov 2017 16:19:44 +0000 (17:19 +0100)
travis.sh

index 8f9149b097872ea872ceb263af7c9dc7e45b9866..2c003a8bf8125c9c9a193d1009ec4168bd07549b 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -105,15 +105,16 @@ function fixBuildVersion {
 #
 function configureTravis {
   mkdir -p ~/.local
-  curl -sSL https://github.com/SonarSource/travis-utils/tarball/v38 | tar zx --strip-components 1 -C ~/.local
+  curl -sSL https://github.com/SonarSource/travis-utils/tarball/v41 | tar zx --strip-components 1 -C ~/.local
   source ~/.local/bin/install
 }
 configureTravis
 
-# When pull request exists on the branch, then the job related to the branch does not need
-# to be executed and should be canceled. It does not book slaves for nothing.
+# When a pull request is open on the branch, then the job related
+# to the branch does not need to be executed and should be canceled.
+# It does not book slaves for nothing.
 # @TravisCI please provide the feature natively, like at AppVeyor or CircleCI ;-)
-cancel_branch_build_with_pr
+cancel_branch_build_with_pr || if [[ $? -eq 1 ]]; then exit 0; fi
 
 case "$TARGET" in