diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 15:03:51 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 16:28:29 (GMT) |
| commit | 2b4523c5f2f6864eb36fa0eeda22069e0a109dbf (patch) | |
| tree | b52f847400e8f36134e16e2d76fd091ade610129 /.gitlab-ci.yml | |
| parent | d6fe877cf988dc72853d744566ec0ce997647db9 (diff) | |
| download | CMake-2b4523c5f2f6864eb36fa0eeda22069e0a109dbf.zip CMake-2b4523c5f2f6864eb36fa0eeda22069e0a109dbf.tar.gz CMake-2b4523c5f2f6864eb36fa0eeda22069e0a109dbf.tar.bz2 | |
gitlab-ci: make rules a bit more uniform
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 34 |
1 files changed, 17 insertions, 17 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: |