From: Tom <thomas.verin@sonarsource.com>
Date: Mon, 21 Aug 2017 08:51:41 +0000 (+0200)
Subject: BUILD-495 remove code duplication in build script
X-Git-Tag: 6.6-RC1~563
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3d352a5b92e8eef98a6048d65768d5d212e84885;p=sonarqube.git

BUILD-495 remove code duplication in build script
---

diff --git a/travis.sh b/travis.sh
index c1fb2fbf84b..fa5336b652d 100755
--- a/travis.sh
+++ b/travis.sh
@@ -141,18 +141,18 @@ BUILD)
     mvn org.jacoco:jacoco-maven-plugin:prepare-agent deploy \
           $MAVEN_ARGS \
           -Pdeploy-sonarsource,release
+        
+    INCREMENTAL=true          
+    # Triggers a full analysis for every build number ending with 0
     if [[ "$TRAVIS_BUILD_NUMBER" == *0 ]]; then
-      mvn sonar:sonar \
-          -Dsonar.host.url=$SONAR_HOST_URL \
-          -Dsonar.login=$SONAR_TOKEN \
-          -Dsonar.projectVersion=$INITIAL_VERSION
-    else
-      mvn sonar:sonar \
-          -Dsonar.incremental=true \
+      INCREMENTAL=false
+    fi
+
+    mvn sonar:sonar \
+          -Dsonar.incremental=$INCREMENTAL \
           -Dsonar.host.url=$SONAR_HOST_URL \
           -Dsonar.login=$SONAR_TOKEN \
           -Dsonar.projectVersion=$INITIAL_VERSION
-    fi
 
   elif [[ "$TRAVIS_BRANCH" == "branch-"* ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     echo 'Build release branch'