lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'eclipse/master'

Browse Source
This commit is contained in:
Kai Zimmermann
2016-02-02 08:53:59 +01:00
parent 4a2b09387a a01b8c2dd5
commit 4df411b97f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sonarCircleCi.sh
View File

@@ -11,19 +11,19 @@ echo $CI_PULL_REQUEST pull request
# regular sonar on master # regular sonar on master
if [ "$CIRCLE_BRANCH" = "master" ]; then if [ "$CIRCLE_BRANCH" = "master" ]; then
mvn verify license:check sonar:sonar -Dsonar.login=$SONAR_SERVER_USER -Dsonar.password=$SONAR_SERVER_PASSWD 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 else
if [ -n "$CI_PULL_REQUEST" ]; then #if [ -n "$CI_PULL_REQUEST" ]; then
mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify license:check sonar:sonar -B -e -V \ # mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify license:check sonar:sonar -B -e -V \
-Dclirr=true \ # -Dclirr=true \
-Dsonar.analysis.mode=issues \ # -Dsonar.analysis.mode=issues \
-Dsonar.github.pullRequest=`echo $CI_PULL_REQUEST| awk -F'/' '{print $7}'` \ # -Dsonar.github.pullRequest=`echo $CI_PULL_REQUEST| awk -F'/' '{print $7}'` \
-Dsonar.github.login=$SONAR_GITHUB_LOGIN \ # -Dsonar.github.login=$SONAR_GITHUB_LOGIN \
-Dsonar.github.oauth=$SONAR_GITHUB_OAUTH \ # -Dsonar.github.oauth=$SONAR_GITHUB_OAUTH \
-Dsonar.login=$SONAR_SERVER_USER \ # -Dsonar.login=$SONAR_SERVER_USER \
-Dsonar.password=$SONAR_SERVER_PASSWD # -Dsonar.password=$SONAR_SERVER_PASSWD
else #else
mvn verify license:check mvn verify license:check
fi #fi
fi fi
# but noting in case of other branches # but noting in case of other branches