diff options
| author | Jack Lloyd <[email protected]> | 2016-08-22 12:16:05 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-22 12:16:05 -0400 |
| commit | 10eb64e54d18e83c3c0c0697314465daa106c8ae (patch) | |
| tree | ebf7708d781d288650d6cc1fba1239da6af544df | |
| parent | bcc4d24bb25bd1cb1ee53e1f6dadbafd21c126d5 (diff) | |
| parent | 702bd053fc061323e2275d5a7a8b6afc80505c4d (diff) | |
Merge GH #599 Disable SonarQube
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index 35bff74df..78fd75c52 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -62,20 +62,23 @@ if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ # Analysis is done only on master so that build of branches don't push analyses to the same project and therefore "pollute" the results echo "Starting analysis by SonarQube..." sonar-scanner -Dsonar.login=$SONAR_TOKEN -elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN-}" ] && [ "$BUILD_MODE" = "sonarqube" ]; then +fi + +# PR analysis deactivated at least until custom quality profiles can be created +#elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN-}" ] && [ "$BUILD_MODE" = "sonarqube" ]; then # => This will analyse the PR and display found issues as comments in the PR, but it won't push results to the SonarQube server # # For security reasons environment variables are not available on the pull requests # coming from outside repositories # http://docs.travis-ci.com/user/pull-requests/#Security-Restrictions-when-testing-Pull-Requests # That's why the analysis does not need to be executed if the variable GITHUB_TOKEN is not defined. - echo "Starting Pull Request analysis by SonarQube..." - sonar-scanner -Dsonar.login=$SONAR_TOKEN \ - -Dsonar.analysis.mode=preview \ - -Dsonar.github.oauth=$GITHUB_TOKEN \ - -Dsonar.github.repository=$TRAVIS_REPO_SLUG \ - -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST -fi +# echo "Starting Pull Request analysis by SonarQube..." +# sonar-scanner -Dsonar.login=$SONAR_TOKEN \ +# -Dsonar.analysis.mode=preview \ +# -Dsonar.github.oauth=$GITHUB_TOKEN \ +# -Dsonar.github.repository=$TRAVIS_REPO_SLUG \ +# -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST +#fi # When neither on master branch nor on a non-external pull request => nothing to do if [ "$MODULES" != "min" ] && [ "${TARGETOS:0:3}" != "ios" ] && [ "$BUILD_MODE" != "sonarqube" ]; then |