Merge topic 'gitlab-ci-prefer-mr' into release-3.18

f6a80ffd54 gitlab-ci: Prefer MR rules for any pipeline associated with a MR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5214
This commit is contained in:
Brad King
2020-09-10 20:02:51 +00:00
committed by Kitware Robot

View File

@@ -2,17 +2,17 @@
.run_manually:
rules:
- if: '$CI_MERGE_REQUEST_ID'
when: manual
- if: '$CI_PROJECT_PATH == "cmake/cmake"'
when: delayed
start_in: 5 minutes
- if: '$CI_MERGE_REQUEST_ID'
when: manual
- when: never
.run_automatically:
rules:
- if: '$CI_PROJECT_PATH == "cmake/cmake"'
when: on_success
- if: '$CI_MERGE_REQUEST_ID'
when: on_success
- if: '$CI_PROJECT_PATH == "cmake/cmake"'
when: on_success
- when: never