diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-10 20:02:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-10 20:02:56 (GMT) |
| commit | 06cb6a162872cdd45a51dfce718d63ecea8a2d03 (patch) | |
| tree | 1ad0152f103fe2df8362095f33114517e930bb74 | |
| parent | 9b5f167348d1bb6e4ddaa0a105d6794b9f290122 (diff) | |
| parent | f6a80ffd545dcdc0c36f3ac878aa971f33f3ade5 (diff) | |
| download | CMake-06cb6a162872cdd45a51dfce718d63ecea8a2d03.zip CMake-06cb6a162872cdd45a51dfce718d63ecea8a2d03.tar.gz CMake-06cb6a162872cdd45a51dfce718d63ecea8a2d03.tar.bz2 | |
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
| -rw-r--r-- | .gitlab/rules.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index 88756eb..3bb8ae4 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -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 |