Commit 8da8862d authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '14-do-not-suppose-maven-is-involved' into 'master' 

Resolve "Do not suppose Maven is involved"

Closes #14

See merge request to-be-continuous/sonar!22
parents 906caf89 459266dd

README.md

+1 −1
Original line number Diff line number Diff line
@@ -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.

templates/gitlab-ci-sonar.yml

+2 −2
Original line number Diff line number Diff line
@@ -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" ]]