Really use the right URL, bummer.

[simgrid.git] / tools / internal / travis-sonarqube.sh

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index 8075f4a..6201f57 100755 (executable)
--- a/tools/internal/travis-sonarqube.sh
+++ b/tools/internal/travis-sonarqube.sh
@@ -1,6 +1,19 @@
 #! /bin/sh
 
-# Run SonarQube on travis.
+# Install and run SonarQube on travis. 
+#
+# Use it as a wrapper to your build command, eg: ./travis-sonarqube.sh make VERBOSE=1
+
+# On Mac OSX or with pull requests, you don't want to run SonarQube but to exec the build command directly.
+if [ ${TRAVIS_OS_NAME} != 'linux' ] || [ ${TRAVIS_PULL_REQUEST} != 'false' ] 
+then
+  exec "$@"
+fi
+# Passed this point, we are on Linux and not in a PR (exec never returns)
+
+
+# Be verbose and fail fast
+set -ex
 
 # Install required software
 installSonarQubeScanner() {
@@ -14,15 +27,15 @@ installSonarQubeScanner() {
   export SONAR_SCANNER_OPTS="-server"
 }
 installBuildWrapper() {
-  curl -LsS https://nemo.sonarqube.org/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
+  curl -LsS https://sonarqube.com/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
   unzip build-wrapper-linux-x86.zip
 }
 installSonarQubeScanner
 installBuildWrapper
 
 # triggers the compilation through the build wrapper to gather compilation database
-./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs
-make build-nocheck
+./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs "$@"
 
-# and finally execute the actual SonarQube analysis
-sonar-scanner -Dsonar.host.url=https://nemo.sonarqube.org -Dsonar.login=7f3a6edf2fc5fcfa22c3fb95ce13597dc4b1fb15
+# and finally execute the actual SonarQube analysis (the SONAR_TOKEN is set from the travis web interface, to not expose it)
+# See https://docs.travis-ci.com/user/sonarqube/ for more info on tokens
+sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_TOKEN