diff --git a/README.md b/README.md index f672d9bd261043843d4b94c84480ef96ce13738d..5d6f09443eb18a3a3bd1dbfbb8026439389313dd 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Those is a great SonarQube features but it assumes one of the following conditio If you're not in one of those cases, then you shall disable this feature by setting `SONAR_BRANCH_ANALYSIS_DISABLED`. -If you leave the feature enabled, if `SONAR_AUTH_TOKEN` is provided, the template will try to autodetect (using GitLab APIs) an opened merge request matching the current branch: +If you leave the feature enabled, if `SONAR_GITLAB_TOKEN` is provided, the template will try to autodetect (using GitLab APIs) an opened merge request matching the current branch: * If one is found, a SonarQube [Pull Request Analysis](https://docs.sonarqube.org/latest/analysis/pull-request/) will be made. * Otherwise, a simple [Branch Analysis](https://docs.sonarqube.org/latest/branches/overview/) is performed on the current branch. diff --git a/templates/gitlab-ci-sonar.yml b/templates/gitlab-ci-sonar.yml index 75edd9809aa5eec694bd3b03266ee088bf8b97fe..edaf5883367a4b171a8cda0de525385e7e55ad6e 100644 --- a/templates/gitlab-ci-sonar.yml +++ b/templates/gitlab-ci-sonar.yml @@ -137,8 +137,8 @@ stages: fi if [[ "$CI_MERGE_REQUEST_ID" ]] then - # we are in an MR pipeline: no need to pass arguments as the SonarScanner for Maven will - log_info "Merge Request pipeline detected: let Maven plugin handle..." + # we are in an MR pipeline: no need to pass arguments as SonarScanner will + log_info "Merge Request pipeline detected: let SonarScanner handle..." return fi if [[ -n "$SONAR_GITLAB_TOKEN" ]]