diff --git a/sonarCircleCi.sh b/sonarCircleCi.sh index ec3f31f91..cf03e5593 100644 --- a/sonarCircleCi.sh +++ b/sonarCircleCi.sh @@ -11,19 +11,19 @@ echo $CI_PULL_REQUEST pull request # regular sonar on master if [ "$CIRCLE_BRANCH" = "master" ]; then mvn verify license:check sonar:sonar -Dsonar.login=$SONAR_SERVER_USER -Dsonar.password=$SONAR_SERVER_PASSWD -# preview in case of pull request +# preview in case of pull request - disabled as circle does not fill those with pull reuqests from different directories else - if [ -n "$CI_PULL_REQUEST" ]; then - mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify license:check sonar:sonar -B -e -V \ - -Dclirr=true \ - -Dsonar.analysis.mode=issues \ - -Dsonar.github.pullRequest=`echo $CI_PULL_REQUEST| awk -F'/' '{print $7}'` \ - -Dsonar.github.login=$SONAR_GITHUB_LOGIN \ - -Dsonar.github.oauth=$SONAR_GITHUB_OAUTH \ - -Dsonar.login=$SONAR_SERVER_USER \ - -Dsonar.password=$SONAR_SERVER_PASSWD - else + #if [ -n "$CI_PULL_REQUEST" ]; then + # mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify license:check sonar:sonar -B -e -V \ + # -Dclirr=true \ + # -Dsonar.analysis.mode=issues \ + # -Dsonar.github.pullRequest=`echo $CI_PULL_REQUEST| awk -F'/' '{print $7}'` \ + # -Dsonar.github.login=$SONAR_GITHUB_LOGIN \ + # -Dsonar.github.oauth=$SONAR_GITHUB_OAUTH \ + # -Dsonar.login=$SONAR_SERVER_USER \ + # -Dsonar.password=$SONAR_SERVER_PASSWD + #else mvn verify license:check - fi + #fi fi # but noting in case of other branches