diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7440f2..cf7cb26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ - when: never .fedora31: &fedora31 - image: "kitware/cmake:ci-fedora31-x86_64-2020-05-08" + image: "kitware/cmake:ci-fedora31-x86_64-2020-06-01" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -57,6 +57,14 @@ CMAKE_CONFIGURATION: fedora31_ninja CTEST_NO_WARNINGS_ALLOWED: 1 +.fedora31_ninja_multi: &fedora31_ninja_multi + extends: .fedora31 + + variables: + CMAKE_CONFIGURATION: fedora31_ninja_multi + CTEST_NO_WARNINGS_ALLOWED: 1 + CMAKE_GENERATOR: "Ninja Multi-Config" + .fedora31_makefiles: &fedora31_makefiles extends: .fedora31 @@ -297,6 +305,20 @@ interruptible: true +.cmake_test_unix_external: &cmake_test_unix_external + stage: test-ext + + script: + - *before_script_unix + - .gitlab/ci/sccache.sh + # Allow the server to already be running. + - "sccache --start-server || :" + - sccache --show-stats + - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake" + - sccache --show-stats + + interruptible: true + .cmake_test_windows_external: &cmake_test_windows_external stage: test-ext @@ -321,7 +343,7 @@ build:fedora31-tidy: <<: - *fedora31_tidy - *cmake_build_unix - - *linux_builder_tags + - *linux_builder_tags_qt rules: *rules_settings build:fedora31-sphinx: @@ -336,7 +358,7 @@ build:fedora31-ninja: - *fedora31_ninja - *cmake_build_unix - *cmake_build_artifacts - - *linux_builder_tags + - *linux_builder_tags_qt rules: *manual_rules_settings test:fedora31-ninja: @@ -344,18 +366,30 @@ test:fedora31-ninja: - *fedora31_ninja - *cmake_test_unix - *linux_builder_tags_qt + - *cmake_test_artifacts rules: *rules_settings dependencies: - build:fedora31-ninja needs: - build:fedora31-ninja +test:fedora31-ninja-multi: + <<: + - *fedora31_ninja_multi + - *cmake_test_unix_external + - *linux_builder_tags_qt + rules: *rules_settings + dependencies: + - test:fedora31-ninja + needs: + - test:fedora31-ninja + build:fedora31-makefiles: <<: - *fedora31_makefiles - *cmake_build_unix - *cmake_build_artifacts - - *linux_builder_tags + - *linux_builder_tags_qt rules: *manual_rules_settings test:fedora31-makefiles: |