diff options
| -rw-r--r-- | .gitlab-ci.yml | 34 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 28 |
2 files changed, 32 insertions, 30 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fa3f55..22d3578 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,21 +21,21 @@ build:debian10-iwyu: - *debian10_iwyu - *cmake_build_unix - *linux_builder_tags - rules: *rules_settings + - *run_automatically build:fedora31-tidy: <<: - *fedora31_tidy - *cmake_build_unix - *linux_builder_tags_qt - rules: *rules_settings + - *run_automatically build:fedora31-sphinx: <<: - *fedora31_sphinx - *cmake_build_unix - *linux_builder_tags_qt - rules: *rules_settings + - *run_automatically # Linux builds @@ -45,14 +45,14 @@ build:centos6-release: - *cmake_build_release_linux - *cmake_release_artifacts - *linux_builder_tags - rules: *manual_rules_settings + - *run_manually test:fedora31-makefiles: <<: - *fedora31_makefiles - *cmake_test_linux_package - *linux_builder_tags_qt - rules: *rules_settings + - *run_automatically dependencies: - build:centos6-release needs: @@ -63,7 +63,7 @@ test:cuda10.2-nvidia: - *cuda10_2_nvidia - *cmake_test_linux_package - *linux_builder_tags_cuda - rules: *rules_settings + - *run_automatically dependencies: - build:centos6-release needs: @@ -75,7 +75,7 @@ build:fedora31-ninja: - *cmake_build_unix - *cmake_build_artifacts - *linux_builder_tags_qt - rules: *manual_rules_settings + - *run_manually test:fedora31-ninja: <<: @@ -83,7 +83,7 @@ test:fedora31-ninja: - *cmake_test_unix - *linux_builder_tags_qt - *cmake_test_artifacts - rules: *rules_settings + - *run_automatically dependencies: - build:fedora31-ninja needs: @@ -94,7 +94,7 @@ test:fedora31-ninja-multi: - *fedora31_ninja_multi - *cmake_test_linux_external - *linux_builder_tags_qt - rules: *rules_settings + - *run_automatically dependencies: - test:fedora31-ninja needs: @@ -108,7 +108,7 @@ build:macos-ninja: - *cmake_build_unix - *cmake_build_artifacts - *macos_builder_tags - rules: *manual_rules_settings + - *run_manually test:macos-ninja: <<: @@ -116,7 +116,7 @@ test:macos-ninja: - *cmake_test_unix - *cmake_test_artifacts - *macos_builder_tags - rules: *rules_settings + - *run_automatically dependencies: - build:macos-ninja needs: @@ -128,14 +128,14 @@ build:macos-makefiles: - *cmake_build_unix - *cmake_build_artifacts - *macos_builder_tags - rules: *manual_rules_settings + - *run_manually test:macos-makefiles: <<: - *macos_makefiles - *cmake_test_unix - *macos_builder_tags - rules: *rules_settings + - *run_automatically dependencies: - build:macos-makefiles needs: @@ -146,7 +146,7 @@ test:macos-xcode: - *macos_xcode - *cmake_test_macos_external - *macos_builder_ext_tags - rules: *rules_settings + - *run_automatically dependencies: - test:macos-ninja needs: @@ -160,7 +160,7 @@ build:windows-vs2019-x64-ninja: - *cmake_build_windows - *cmake_build_artifacts - *windows_builder_tags - rules: *manual_rules_settings + - *run_manually test:windows-vs2019-x64-ninja: <<: @@ -168,7 +168,7 @@ test:windows-vs2019-x64-ninja: - *cmake_test_windows - *windows_builder_tags - *cmake_test_artifacts - rules: *rules_settings + - *run_automatically dependencies: - build:windows-vs2019-x64-ninja needs: @@ -179,7 +179,7 @@ test:windows-vs2019-x64: - *windows_vs2019_x64 - *cmake_test_windows_external - *windows_builder_ext_tags - rules: *rules_settings + - *run_automatically dependencies: - test:windows-vs2019-x64-ninja needs: diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index 6911e5e..3dc06f7 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 |