From 459266ddf57523a9e2f789d8d76eeeccf8477fb6 Mon Sep 17 00:00:00 2001
From: Guilhem Bonnefille <guilhem.bonnefille@c-s.fr>
Date: Wed, 6 Jul 2022 15:49:42 +0000
Subject: [PATCH] doc: fix reference to GITLAB variable
---
README.md | 2 +-
templates/gitlab-ci-sonar.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index f672d9b..5d6f094 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 75edd98..edaf588 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" ]]
--
GitLab