mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: make rules a bit more uniform

Browse Source
This commit is contained in:
Ben Boeckel
2020-06-12 11:03:51 -04:00
parent d6fe877cf9
commit 2b4523c5f2
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+17 -17
View File
@@ -21,21 +21,21 @@ build:debian10-iwyu:
- *debian10_iwyu - *debian10_iwyu
- *cmake_build_unix - *cmake_build_unix
- *linux_builder_tags - *linux_builder_tags
rules: *rules_settings - *run_automatically
build:fedora31-tidy: build:fedora31-tidy:
<<: <<:
- *fedora31_tidy - *fedora31_tidy
- *cmake_build_unix - *cmake_build_unix
- *linux_builder_tags_qt - *linux_builder_tags_qt
rules: *rules_settings - *run_automatically
build:fedora31-sphinx: build:fedora31-sphinx:
<<: <<:
- *fedora31_sphinx - *fedora31_sphinx
- *cmake_build_unix - *cmake_build_unix
- *linux_builder_tags_qt - *linux_builder_tags_qt
rules: *rules_settings - *run_automatically
# Linux builds # Linux builds
@@ -45,14 +45,14 @@ build:centos6-release:
- *cmake_build_release_linux - *cmake_build_release_linux
- *cmake_release_artifacts - *cmake_release_artifacts
- *linux_builder_tags - *linux_builder_tags
rules: *manual_rules_settings - *run_manually
test:fedora31-makefiles: test:fedora31-makefiles:
<<: <<:
- *fedora31_makefiles - *fedora31_makefiles
- *cmake_test_linux_package - *cmake_test_linux_package
- *linux_builder_tags_qt - *linux_builder_tags_qt
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- build:centos6-release - build:centos6-release
needs: needs:
@@ -63,7 +63,7 @@ test:cuda10.2-nvidia:
- *cuda10_2_nvidia - *cuda10_2_nvidia
- *cmake_test_linux_package - *cmake_test_linux_package
- *linux_builder_tags_cuda - *linux_builder_tags_cuda
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- build:centos6-release - build:centos6-release
needs: needs:
@@ -75,7 +75,7 @@ build:fedora31-ninja:
- *cmake_build_unix - *cmake_build_unix
- *cmake_build_artifacts - *cmake_build_artifacts
- *linux_builder_tags_qt - *linux_builder_tags_qt
rules: *manual_rules_settings - *run_manually
test:fedora31-ninja: test:fedora31-ninja:
<<: <<:
@@ -83,7 +83,7 @@ test:fedora31-ninja:
- *cmake_test_unix - *cmake_test_unix
- *linux_builder_tags_qt - *linux_builder_tags_qt
- *cmake_test_artifacts - *cmake_test_artifacts
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- build:fedora31-ninja - build:fedora31-ninja
needs: needs:
@@ -94,7 +94,7 @@ test:fedora31-ninja-multi:
- *fedora31_ninja_multi - *fedora31_ninja_multi
- *cmake_test_linux_external - *cmake_test_linux_external
- *linux_builder_tags_qt - *linux_builder_tags_qt
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- test:fedora31-ninja - test:fedora31-ninja
needs: needs:
@@ -108,7 +108,7 @@ build:macos-ninja:
- *cmake_build_unix - *cmake_build_unix
- *cmake_build_artifacts - *cmake_build_artifacts
- *macos_builder_tags - *macos_builder_tags
rules: *manual_rules_settings - *run_manually
test:macos-ninja: test:macos-ninja:
<<: <<:
@@ -116,7 +116,7 @@ test:macos-ninja:
- *cmake_test_unix - *cmake_test_unix
- *cmake_test_artifacts - *cmake_test_artifacts
- *macos_builder_tags - *macos_builder_tags
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- build:macos-ninja - build:macos-ninja
needs: needs:
@@ -128,14 +128,14 @@ build:macos-makefiles:
- *cmake_build_unix - *cmake_build_unix
- *cmake_build_artifacts - *cmake_build_artifacts
- *macos_builder_tags - *macos_builder_tags
rules: *manual_rules_settings - *run_manually
test:macos-makefiles: test:macos-makefiles:
<<: <<:
- *macos_makefiles - *macos_makefiles
- *cmake_test_unix - *cmake_test_unix
- *macos_builder_tags - *macos_builder_tags
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- build:macos-makefiles - build:macos-makefiles
needs: needs:
@@ -146,7 +146,7 @@ test:macos-xcode:
- *macos_xcode - *macos_xcode
- *cmake_test_macos_external - *cmake_test_macos_external
- *macos_builder_ext_tags - *macos_builder_ext_tags
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- test:macos-ninja - test:macos-ninja
needs: needs:
@@ -160,7 +160,7 @@ build:windows-vs2019-x64-ninja:
- *cmake_build_windows - *cmake_build_windows
- *cmake_build_artifacts - *cmake_build_artifacts
- *windows_builder_tags - *windows_builder_tags
rules: *manual_rules_settings - *run_manually
test:windows-vs2019-x64-ninja: test:windows-vs2019-x64-ninja:
<<: <<:
@@ -168,7 +168,7 @@ test:windows-vs2019-x64-ninja:
- *cmake_test_windows - *cmake_test_windows
- *windows_builder_tags - *windows_builder_tags
- *cmake_test_artifacts - *cmake_test_artifacts
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- build:windows-vs2019-x64-ninja - build:windows-vs2019-x64-ninja
needs: needs:
@@ -179,7 +179,7 @@ test:windows-vs2019-x64:
- *windows_vs2019_x64 - *windows_vs2019_x64
- *cmake_test_windows_external - *cmake_test_windows_external
- *windows_builder_ext_tags - *windows_builder_ext_tags
rules: *rules_settings - *run_automatically
dependencies: dependencies:
- test:windows-vs2019-x64-ninja - test:windows-vs2019-x64-ninja
needs: needs:
.gitlab/rules.yml
+15 -13
View File
@@ -1,16 +1,18 @@
# Rules for where jobs can run # Rules for where jobs can run
.manual_rules_settings: &manual_rules_settings .run_manually: &run_manually
- if: '$CI_PROJECT_PATH == "cmake/cmake"' rules:
when: delayed - if: '$CI_PROJECT_PATH == "cmake/cmake"'
start_in: 5 minutes when: delayed
- if: '$CI_MERGE_REQUEST_ID' start_in: 5 minutes
when: manual - if: '$CI_MERGE_REQUEST_ID'
- when: never when: manual
- when: never
.rules_settings: &rules_settings .run_automatically: &run_automatically
- if: '$CI_PROJECT_PATH == "cmake/cmake"' rules:
when: always - if: '$CI_PROJECT_PATH == "cmake/cmake"'
- if: '$CI_MERGE_REQUEST_ID' when: always
when: always - if: '$CI_MERGE_REQUEST_ID'
- when: never when: always
- when: never