summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2020-06-12 11:03:51 -0400
committerBen Boeckel <ben.boeckel@kitware.com>2020-06-12 12:28:29 -0400
commit2b4523c5f2f6864eb36fa0eeda22069e0a109dbf (patch)
treeb52f847400e8f36134e16e2d76fd091ade610129 /.gitlab
parentd6fe877cf988dc72853d744566ec0ce997647db9 (diff)
downloadcmake-2b4523c5f2f6864eb36fa0eeda22069e0a109dbf.tar.gz
gitlab-ci: make rules a bit more uniform
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/rules.yml28
1 files changed, 15 insertions, 13 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 6911e5ee1e..3dc06f7ec6 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -1,16 +1,18 @@
# Rules for where jobs can run
-.manual_rules_settings: &manual_rules_settings
- - if: '$CI_PROJECT_PATH == "cmake/cmake"'
- when: delayed
- start_in: 5 minutes
- - if: '$CI_MERGE_REQUEST_ID'
- when: manual
- - when: never
+.run_manually: &run_manually
+ rules:
+ - if: '$CI_PROJECT_PATH == "cmake/cmake"'
+ when: delayed
+ start_in: 5 minutes
+ - if: '$CI_MERGE_REQUEST_ID'
+ when: manual
+ - when: never
-.rules_settings: &rules_settings
- - if: '$CI_PROJECT_PATH == "cmake/cmake"'
- when: always
- - if: '$CI_MERGE_REQUEST_ID'
- when: always
- - when: never
+.run_automatically: &run_automatically
+ rules:
+ - if: '$CI_PROJECT_PATH == "cmake/cmake"'
+ when: always
+ - if: '$CI_MERGE_REQUEST_ID'
+ when: always
+ - when: never