diff --git a/templates/gitlab-ci-sonar.yml b/templates/gitlab-ci-sonar.yml index 70acee7d9f516204c40fb8158bfb39f258a7af1c..4ef333fa35675c428f228dab70eafdb50fc0b77d 100644 --- a/templates/gitlab-ci-sonar.yml +++ b/templates/gitlab-ci-sonar.yml @@ -135,9 +135,9 @@ stages: wget -q "$CI_API_V4_URL/projects/${CI_PROJECT_ID}/merge_requests?state=opened&source_branch=${CI_COMMIT_REF_NAME}&private_token=$SONAR_GITLAB_TOKEN" -O mr.json || log_warn "Failed requesting GitLab API: check \$SONAR_GITLAB_TOKEN" if [[ -f mr.json ]] && [[ "$(cat mr.json)" != "[]" ]] then - mr_title=$(sed -E 's/.*"title":"([^"]*)".*/\1/g' < mr.json) - mr_target=$(sed -E 's/.*"target_branch":"([^"]*)".*/\1/g' < mr.json) - mr_id=$(sed -E 's/.*"iid":([0-9]+).*/\1/g' < mr.json) + mr_title=$(sed -E 's/\[\{[^{]*"title":"([^"]*)".*/\1/g' < mr.json) + mr_target=$(sed -E 's/\[\{[^{]*"target_branch":"([^"]*)".*/\1/g' < mr.json) + mr_id=$(sed -E 's/\[\{[^{]*"iid":([0-9]+).*/\1/g' < mr.json) log_info "Merge Request \\e[33;1m$mr_title\\e[0m detected associated to this branch: trigger MR analysis..." export sonar_mr_args="-Dsonar.pullrequest.key=$mr_id -Dsonar.pullrequest.branch=${CI_COMMIT_REF_NAME} -Dsonar.pullrequest.base=$mr_target" else