Commit 874796e8 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Fix: protect branch after generation of CR and only during creation of MR.... 

Fix: protect branch after generation of CR and only during creation of MR. Different procedure for already opened MR (in case of revised contributions)
parent 7291dcd5

.gitlab-ci.yml

+12 −4
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@ workflow: 
    - if: $CI_COMMIT_TAG

    - if: $CI_COMMIT_TAG

    - if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"

    - if: $CI_COMMIT_BRANCH && $CI_PROJECT_NAME == "scripts"

    - if: $CI_PIPELINE_SOURCE == "web"

    - if: $CI_PIPELINE_SOURCE == "web"

    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS

      when: never





variables:

variables:
@@ -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/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 "${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:

  script:

    - echo 'CR contribution'

    - echo 'CR contribution'

    - mkdir docs

    - mkdir docs
@@ -60,6 +60,14 @@ Word CR text: 
      - docs/

      - docs/

    expose_as: 'Word CR text'

    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:

Publish spec:

  stage: publication

  stage: publication

  only:

  only: