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
Pipeline #4952 passed with stage
in 19 seconds
......@@ -13,7 +13,7 @@ workflow:
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_PIPELINE_SOURCE == "pipeline"
- 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
# pipeline on a related merge request already. If yes, we simply return
......@@ -26,7 +26,7 @@ check-pipeline-status:
when: never
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
- if: $CI_COMMIT_BRANCH == "master"
- if: '$CI_COMMIT_BRANCH =~ /^(master|releases\/)/'
when: always
script:
- |
......
Markdown is supported
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