]> source.dussan.org Git - sonarqube.git/commitdiff
Re-enable analysis
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Mon, 19 Mar 2018 12:40:54 +0000 (13:40 +0100)
committerSonarTech <sonartech@sonarsource.com>
Thu, 22 Mar 2018 11:37:48 +0000 (12:37 +0100)
travis.sh

index 5328e02dc61f9b28413204043b518d89f8f3e31f..90e25585b6e70b0ff4a9c08f534ca0a54d5b0cb5 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -81,10 +81,9 @@ BUILD)
 
   elif [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     echo 'Build and analyze master'
-    # FIXME analysis disabled for now
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.projectVersion=$INITIAL_VERSION \
@@ -95,10 +94,9 @@ BUILD)
 
   elif [[ "$TRAVIS_BRANCH" == "branch-"* ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     echo 'Build release branch'
-    # FIXME analysis disabled for now
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.branch.name=$TRAVIS_BRANCH \
@@ -112,7 +110,7 @@ BUILD)
     echo 'Build and analyze internal pull request'
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.analysis.buildNumber=$BUILD_NUMBER \