The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

ci: switch between branch and merge request pipelines to avoid duplication

See https://docs.gitlab.com/ci/yaml/workflow/#switch-between-branch-pipelines-and-merge-request-pipelines

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2504>

authored by

Simon Zeni and committed by
Marge Bot
ffe553db bfd76fed

+14 -8
+7 -4
.gitlab-ci.yml
··· 6 6 # see .gitlab-ci/ci.template, etc instead 7 7 ############################################### 8 8 9 - # workflow: 10 - # rules: 11 - # - if: $CI_PIPELINE_SOURCE == 'merge_request_event' 12 - # - if: $CI_PIPELINE_SOURCE == 'push' 9 + workflow: 10 + rules: 11 + # Switch between branch and merge request pipelines to avoid duplication 12 + - if: $CI_PIPELINE_SOURCE == "merge_request_event" 13 + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS 14 + when: never 15 + - if: $CI_COMMIT_BRANCH 13 16 14 17 variables: 15 18 FDO_UPSTREAM_REPO: "monado/monado"
+7 -4
.gitlab-ci/templates/.gitlab-ci.yml.jinja
··· 22 22 make -f .gitlab-ci/ci-scripts.mk 23 23 #} 24 24 25 - # workflow: 26 - # rules: 27 - # - if: $CI_PIPELINE_SOURCE == 'merge_request_event' 28 - # - if: $CI_PIPELINE_SOURCE == 'push' 25 + workflow: 26 + rules: 27 + # Switch between branch and merge request pipelines to avoid duplication 28 + - if: $CI_PIPELINE_SOURCE == "merge_request_event" 29 + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS 30 + when: never 31 + - if: $CI_COMMIT_BRANCH 29 32 30 33 variables: 31 34 FDO_UPSTREAM_REPO: "monado/monado"