From a9c236cdfa624386e6a44181561d7380b1e491eb Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Wed, 15 Feb 2023 17:17:34 +0100 Subject: [PATCH] FEAT #23864 TIME 1:15 use gitlab template in ci --- .gitlab/merge_request_templates/mr_template.md | 2 +- ci/create_mr.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab/merge_request_templates/mr_template.md b/.gitlab/merge_request_templates/mr_template.md index 31f8ef37c2..97d8e445f3 100644 --- a/.gitlab/merge_request_templates/mr_template.md +++ b/.gitlab/merge_request_templates/mr_template.md @@ -1,5 +1,5 @@ ## Description -Description de l'US +[[#{US_ID}](https://forge.maarch.org/issues/{US_ID})] - {US_TITLE} ## Correctif / évolution Décrire le changement effectué diff --git a/ci/create_mr.sh b/ci/create_mr.sh index 59c61997f0..a5eb28db2f 100644 --- a/ci/create_mr.sh +++ b/ci/create_mr.sh @@ -52,7 +52,9 @@ else SUBJECT=`cat issue_$US.json | jq -r '.issue.subject'` - BODY="{\"id\":\"$CI_PROJECT_ID\",\"source_branch\":\"$CI_COMMIT_REF_NAME\",\"target_branch\":\"$TARGET_BRANCH\",\"title\":\"Draft: [$US] $SUBJECT\",\"description\":\"$SUBJECT\n=> https://forge.maarch.org/issues/$US\",\"remove_source_branch\":\"true\",\"squash\":\"false\"}" + MR_DESCRIPTION=$(awk 'BEGIN{RS="\n";ORS="\\n"}1' .gitlab/merge_request_templates/mr_template.md | sed -e "s/{US_ID}/$US/g" | sed -e "s/{US_TITLE}/$SUBJECT/g") + + BODY="{\"id\":\"$CI_PROJECT_ID\",\"source_branch\":\"$CI_COMMIT_REF_NAME\",\"target_branch\":\"$TARGET_BRANCH\",\"title\":\"Draft: [$US] $SUBJECT\",\"description\":\"$MR_DESCRIPTION\",\"remove_source_branch\":\"true\",\"squash\":\"false\"}" echo $BODY -- GitLab