diff --git a/templates/release-mr.yml b/templates/release-mr.yml index 6e76bc2cf5013ea15b4d14b843226c39d5665333..25062eb47e26e05142142efaba9e3abed1fde9bc 100644 --- a/templates/release-mr.yml +++ b/templates/release-mr.yml @@ -2,7 +2,7 @@ include: - local: '/templates/shared/all.yml' variables: - RELEASE_MR_SOURCE_BRANCH: $CI_DEFAULT_BRANCH + RELEASE_MR_SOURCE_BRANCH: develop RELEASE_MR_TARGET_BRANCH: master release_mr: @@ -15,17 +15,16 @@ release_mr: when: never - if: $CI_AWE_SKIP_ALL when: never - - if: $CI_MERGE_REQUEST_ID -# $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $RELEASE_MR_TARGET_BRANCH && -# $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $RELEASE_MR_SOURCE_BRANCH -# - if: $CI_AWE_RUN_RELEASE_MR -# - if: $CI_AWE_RUN_ALL + - if: $CI_MERGE_REQUEST_ID && + $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $RELEASE_MR_TARGET_BRANCH && + $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $RELEASE_MR_SOURCE_BRANCH + - if: $CI_AWE_RUN_RELEASE_MR + - if: $CI_AWE_RUN_ALL script: - - env | sort -# - python-gitlab-set-private-token ${RELEASE_MR_TOKEN} -# - DESCRIPTION=$(git log-mr --output markdown --target ${RELEASE_MR_SOURCE_BRANCH} origin/${RELEASE_MR_TARGET_BRANCH}..origin/${RELEASE_MR_SOURCE_BRANCH}) -# - | -# gitlab project-merge-request update \ -# --project-id ${CI_PROJECT_ID} \ -# --mr-iid ${CI_MERGE_REQUEST_IID} \ -# --description ${DESCRIPTION} + - python-gitlab-set-private-token ${RELEASE_MR_TOKEN} + - DESCRIPTION=$(git log-mr --output markdown --target ${RELEASE_MR_SOURCE_BRANCH} origin/${RELEASE_MR_TARGET_BRANCH}..origin/${RELEASE_MR_SOURCE_BRANCH}) + - | + gitlab project-merge-request update \ + --project-id ${CI_PROJECT_ID} \ + --mr-iid ${CI_MERGE_REQUEST_IID} \ + --description ${DESCRIPTION}