From bb87ef81a6215ceea5322a6747b648e253a24331 Mon Sep 17 00:00:00 2001 From: Alexis Saettler Date: Fri, 6 Apr 2018 11:41:30 +0200 Subject: [PATCH] Update Sonar (#1110) * Bump sonar-scanner to version 3.1.0.1141 * Change projectVersion property use --- scripts/tests/travis-sonar.sh | 62 ++++++++++++------------------ scripts/tests/travis-sonar.sh.sig | Bin 72 -> 95 bytes 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/scripts/tests/travis-sonar.sh b/scripts/tests/travis-sonar.sh index ef3d16940..efbbeb48b 100755 --- a/scripts/tests/travis-sonar.sh +++ b/scripts/tests/travis-sonar.sh @@ -7,7 +7,7 @@ function installSonar { echo 'Setup sonar scanner' # set version of sonar scanner to use : - sonarversion=3.0.3.778 + sonarversion=3.1.0.1141 mkdir -p $HOME/sonarscanner pushd $HOME/sonarscanner > /dev/null @@ -33,7 +33,6 @@ function CommonParams { -Dsonar.organization=monicahq \ -Dsonar.php.tests.reportPath=./results/junit.xml \ -Dsonar.php.coverage.reportPaths=./results/coverage.xml,./results/coverage2.xml \ - -Dsonar.projectVersion=$(php artisan monica:getversion) \ $extra } @@ -71,18 +70,15 @@ if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && installSonar gitFetch - echo sonar-scanner $(CommonParams) \ + SONAR_PARAMS="$(CommonParams) \ + -Dsonar.projectVersion=master \ -Dsonar.analysis.buildNumber=$TRAVIS_BUILD_NUMBER \ -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \ -Dsonar.analysis.sha1=$TRAVIS_COMMIT \ - -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG + -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG" - $SONAR_SCANNER_HOME/bin/sonar-scanner $(CommonParams) \ - -Dsonar.analysis.buildNumber=$TRAVIS_BUILD_NUMBER \ - -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \ - -Dsonar.analysis.sha1=$TRAVIS_COMMIT \ - -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG \ - -Dsonar.login=$SONAR_TOKEN + echo sonar-scanner $SONAR_PARAMS + $SONAR_SCANNER_HOME/bin/sonar-scanner $SONAR_PARAMS -Dsonar.login=$SONAR_TOKEN elif [ -n "${TRAVIS_BRANCH:-}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "${SONAR_TOKEN:-}" ]; then echo '============================' @@ -91,27 +87,28 @@ elif [ -n "${TRAVIS_BRANCH:-}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ - installSonar gitFetch - echo sonar-scanner $(CommonParams) \ - -Dsonar.branch.name=$TRAVIS_BRANCH \ + SONAR_PARAMS="$(CommonParams) \ + -Dsonar.projectVersion=$(php artisan monica:getversion) \ -Dsonar.analysis.buildNumber=$TRAVIS_BUILD_NUMBER \ -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \ -Dsonar.analysis.sha1=$TRAVIS_COMMIT \ - -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG + -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG" - $SONAR_SCANNER_HOME/bin/sonar-scanner $(CommonParams) \ - -Dsonar.branch.name=$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 \ - -Dsonar.login=$SONAR_TOKEN + echo sonar-scanner $SONAR_PARAMS + $SONAR_SCANNER_HOME/bin/sonar-scanner $SONAR_PARAMS -Dsonar.login=$SONAR_TOKEN elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${SONAR_TOKEN:-}" ]; then - PULL_REQUEST_BRANCH= - PULL_REQUEST_REPOSITORY=$(curl --silent https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST | jq -r .head.repo.full_name) + REPOS_VALUES=($(curl -sSL https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST | jq -r -c ".head.repo.full_name, .head.repo.owner.login")) - if [ "$PULL_REQUEST_REPOSITORY" == "$REPOSITORY_OWNER" ]; then + PULL_REQUEST_BRANCH= + PULL_REQUEST_REPOSITORY=${REPOS_VALUES[0]} + PULL_REQUEST_USER=${REPOS_VALUES[1]} + + if [ -z "${PULL_REQUEST_REPOSITORY:-}" ] || [ "$PULL_REQUEST_REPOSITORY" == "null" ]; then + echo 'Error with github api call' + exit 1 + elif [ "$PULL_REQUEST_REPOSITORY" == "$REPOSITORY_OWNER" ]; then echo '===================================' echo 'SONAR:Analyze internal pull request' echo '===================================' @@ -120,7 +117,7 @@ elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${SONAR_TOKEN:-}" ]; then echo '===================================' echo 'SONAR:Analyze external pull request' echo '===================================' - PULL_REQUEST_USER=$(curl --silent https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST | jq -r .head.repo.owner.login) + echo External repository: $PULL_REQUEST_REPOSITORY PULL_REQUEST_BRANCH="PR${TRAVIS_PULL_REQUEST}_($PULL_REQUEST_USER)_$TRAVIS_PULL_REQUEST_BRANCH" fi @@ -143,7 +140,7 @@ elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${SONAR_TOKEN:-}" ]; then # fi # analyse with GitHub token to add comment on the PR - echo sonar-scanner $(CommonParams) \ + SONAR_PARAMS="$(CommonParams) \ -Dsonar.branch.name=$PULL_REQUEST_BRANCH \ -Dsonar.branch.target=$TRAVIS_BRANCH \ -Dsonar.analysis.buildNumber=$TRAVIS_BUILD_NUMBER \ @@ -152,19 +149,10 @@ elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${SONAR_TOKEN:-}" ]; then -Dsonar.analysis.prNumber=$TRAVIS_PULL_REQUEST \ -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG \ -Dsonar.pullrequest.github.id=$TRAVIS_PULL_REQUEST \ - -Dsonar.pullrequest.github.repository=$TRAVIS_REPO_SLUG + -Dsonar.pullrequest.github.repository=$TRAVIS_REPO_SLUG" - $SONAR_SCANNER_HOME/bin/sonar-scanner $(CommonParams) \ - -Dsonar.branch.name=$PULL_REQUEST_BRANCH \ - -Dsonar.branch.target=$TRAVIS_BRANCH \ - -Dsonar.analysis.buildNumber=$TRAVIS_BUILD_NUMBER \ - -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \ - -Dsonar.analysis.sha1=$TRAVIS_PULL_REQUEST_SHA \ - -Dsonar.analysis.prNumber=$TRAVIS_PULL_REQUEST \ - -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG \ - -Dsonar.pullrequest.github.id=$TRAVIS_PULL_REQUEST \ - -Dsonar.pullrequest.github.repository=$TRAVIS_REPO_SLUG \ - -Dsonar.login=$SONAR_TOKEN + echo sonar-scanner $SONAR_PARAMS + $SONAR_SCANNER_HOME/bin/sonar-scanner $SONAR_PARAMS -Dsonar.login=$SONAR_TOKEN elif [ ! -a "travis-sonarlauncher" ]; then diff --git a/scripts/tests/travis-sonar.sh.sig b/scripts/tests/travis-sonar.sh.sig index 7a8616fcfa41221b7fa5bd5e8e5342031ff1cde7..993cab5ddf942036cbd7884386414b54fa1619e2 100644 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WQo5o+$n#vv2R7FcFT@QlVulsq`zlniaKr=%D}}b027JZ%rHN+ wYEPwdlX2&fEf@Yy`Za%}=iieK4D*W~GTx~E&+_rdtO=7}$oJTMI&@760ON-%9RL6T literal 72 zcmV-O0Jr~$Mg#y60ssaD0$QAEJOBy_5V(?)9ivER?^TTepqMS0Jj5RJO++8;5))EA e4&7hRO8}stR{+N}i$8=|FHg