aboutsummaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>2017-10-11 08:02:23 +0200
committerssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>2017-10-11 08:02:23 +0200
commitba47e7fd393657a540cdee36df8ba362b671069d (patch)
tree832a1ed0b34009f984e1732d91ffa2710c4e88ea /travis.sh
parentd290f89d73febb0beb3e2a33bc526c4af72c08ac (diff)
parentd1eef867e02c7402a4516fa2dd4d193a03eb2b7b (diff)
downloadsonarqube-ba47e7fd393657a540cdee36df8ba362b671069d.tar.gz
sonarqube-ba47e7fd393657a540cdee36df8ba362b671069d.zip
Automatic merge from branch-6.6
* origin/branch-6.6: Prepare for next development iteration SONAR-9721 Fix potential OkHttpClient connection leak Publish 6.6 Release Candidate 1 fix quality flaws Propagate parameters of SQ analysis required by burgr fix unwanted text wrapping in the header in ie11 SONAR-9908 on Windows, launch Elasticsearch directly, without batch files (#2642) SONAR-9694 Ignore when secondary locations are out of current file for backdating Fix sidebar position helper in IE
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/travis.sh b/travis.sh
index f6f5977cc52..fb8ace1f6d3 100755
--- a/travis.sh
+++ b/travis.sh
@@ -163,7 +163,11 @@ BUILD)
-Dsonar.host.url=$SONAR_HOST_URL \
-Dsonar.login=$SONAR_TOKEN \
-Dsonar.branch.name=$TRAVIS_BRANCH \
- -Dsonar.projectVersion=$INITIAL_VERSION
+ -Dsonar.projectVersion=$INITIAL_VERSION \
+ -Dsonar.analysis.buildNumber=$TRAVIS_BUILD_NUMBER \
+ -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \
+ -Dsonar.analysis.sha1=$TRAVIS_COMMIT \
+ -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG
elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN:-}" ]; then
echo 'Build and analyze internal pull request'
@@ -190,7 +194,11 @@ BUILD)
-Dsonar.host.url=$SONAR_HOST_URL \
-Dsonar.login=$SONAR_TOKEN \
-Dsonar.branch.name=$TRAVIS_PULL_REQUEST_BRANCH \
- -Dsonar.branch.target=$TRAVIS_BRANCH
+ -Dsonar.branch.target=$TRAVIS_BRANCH \
+ -Dsonar.analysis.buildNumber=$TRAVIS_BUILD_NUMBER \
+ -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \
+ -Dsonar.analysis.sha1=$TRAVIS_COMMIT \
+ -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG
fi
else
echo 'Build feature branch or external pull request'