Skip to content
Snippets Groups Projects
Commit a535e793 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'feature/ci-test-release-branches' into 'master' 

[ci] test release branches

See merge request !2669
parents 29c5ab55 97ce14c0
No related branches found
No related tags found
1 merge request!2669[ci] test release branches
Pipeline #4952 passed
Stage: check-status
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 2 additions and 2 deletions
    .gitlab-ci.yml
    + 2
    − 2
    View file @ a535e793
    ...@@ -13,7 +13,7 @@ workflow: ...@@ -13,7 +13,7 @@ workflow:
    - if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
    - if: $CI_PIPELINE_SOURCE == "pipeline" - if: $CI_PIPELINE_SOURCE == "pipeline"
    - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_COMMIT_BRANCH == "master" - if: '$CI_COMMIT_BRANCH =~ /^(master|releases\/)/'
    # for commits happening on master, we check if there was a successful # for commits happening on master, we check if there was a successful
    # pipeline on a related merge request already. If yes, we simply return # pipeline on a related merge request already. If yes, we simply return
    ...@@ -26,7 +26,7 @@ check-pipeline-status: ...@@ -26,7 +26,7 @@ check-pipeline-status:
    when: never when: never
    - if: $CI_PIPELINE_SOURCE == "pipeline" - if: $CI_PIPELINE_SOURCE == "pipeline"
    when: never when: never
    - if: $CI_COMMIT_BRANCH == "master" - if: '$CI_COMMIT_BRANCH =~ /^(master|releases\/)/'
    when: always when: always
    script: script:
    - | - |
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment