aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2018-03-19 13:40:54 +0100
committerSonarTech <sonartech@sonarsource.com>2018-03-22 12:37:48 +0100
commit8011b50e01e40ce8e654e76f06fcbdb4b82dc3e6 (patch)
treef22f56ef86b6ceedb27aa412f214a9d2361b147c
parent2851164336ade8cbeb750294c8f2089933b30107 (diff)
downloadsonarqube-8011b50e01e40ce8e654e76f06fcbdb4b82dc3e6.tar.gz
sonarqube-8011b50e01e40ce8e654e76f06fcbdb4b82dc3e6.zip
Re-enable analysis
-rwxr-xr-xtravis.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/travis.sh b/travis.sh
index 5328e02dc61..90e25585b6e 100755
--- 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 \