travis: Read project/organization for SonarCloud from environment variable

This commit is contained in:
Tobias Brunner 2020-09-04 16:20:40 +02:00
parent 76425800c4
commit fd5cf31108
2 changed files with 7 additions and 4 deletions

View File

@ -39,15 +39,17 @@ env:
jobs: jobs:
include: include:
- env: TEST=sonarcloud - env: TEST=sonarcloud
if: type = push AND env(SONAR_TOKEN) IS present if: |
type = push AND env(SONAR_TOKEN) IS present AND \
env(SONAR_PROJECT) IS present AND \
env(SONAR_ORGANIZATION) IS present
git: git:
depth: false depth: false
cache: cache:
directories: directories:
- $HOME/.sonar-cache - $HOME/.sonar-cache
addons: addons:
sonarcloud: sonarcloud: true
organization: "strongswan"
- env: TEST=lgtm - env: TEST=lgtm
if: type = push AND env(LGTM_TOKEN) IS present if: type = push AND env(LGTM_TOKEN) IS present
git: git:

View File

@ -448,7 +448,8 @@ apidoc)
;; ;;
sonarcloud) sonarcloud)
sonar-scanner \ sonar-scanner \
-Dsonar.projectKey=strongswan \ -Dsonar.projectKey=${SONAR_PROJECT} \
-Dsonar.organization=${SONAR_ORGANIZATION} \
-Dsonar.projectVersion=$(git describe)+${TRAVIS_BUILD_NUMBER} \ -Dsonar.projectVersion=$(git describe)+${TRAVIS_BUILD_NUMBER} \
-Dsonar.sources=. \ -Dsonar.sources=. \
-Dsonar.cfamily.threads=2 \ -Dsonar.cfamily.threads=2 \