From 874796e868949d5f7c153d8f14f4dfc1e633ff42 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 4 Dec 2023 08:16:21 +0100
Subject: [PATCH] Fix: protect branch after generation of CR and only during
creation of MR. Different procedure for already opened MR (in case of revised
contributions)
---
.gitlab-ci.yml | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98e9f31..45d910f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,9 @@ workflow:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"
- if: $CI_PIPELINE_SOURCE == "web"
-
+ - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+ when: never
+
variables:
stages:
@@ -49,8 +51,6 @@ Word CR text:
curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/onem2m_coversheet_template%2Edocx/raw?ref=master" >> onem2m_coversheet_template.docx
- |
curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/Spec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx
- - |
- curl --request POST --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_MERGE_REQUEST_PROJECT_ID}/protected_branches?name=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
script:
- echo 'CR contribution'
- mkdir docs
@@ -59,7 +59,15 @@ Word CR text:
paths:
- docs/
expose_as: 'Word CR text'
-
+
+Protect branch:
+ stage: generation
+ when: on_success
+ script:
+ - |
+ curl --request POST --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_MERGE_REQUEST_PROJECT_ID}/protected_branches?name=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}&merge_access_level=30"
+
+
Publish spec:
stage: publication
only:
--
GitLab