From d81281c9cc05ac10b89fdaafee19f56bf7e20158 Mon Sep 17 00:00:00 2001
From: Teake Nutma <t.a.nutma@rug.nl>
Date: Mon, 4 Jul 2022 12:28:00 +0200
Subject: [PATCH] De-debug
---
templates/release-mr.yml | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/templates/release-mr.yml b/templates/release-mr.yml
index 6e76bc2..25062eb 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}
--
GitLab