diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 15:20:03 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 15:23:19 (GMT) |
| commit | d33b38d4aab6ca719141067c8538b09b95200900 (patch) | |
| tree | 54ab1952bd26855dcfb2eaf2dae7c2a0f5ec11e1 | |
| parent | 3145264449cdc35aef14ff97011a65a782080758 (diff) | |
| download | CMake-d33b38d4aab6ca719141067c8538b09b95200900.zip CMake-d33b38d4aab6ca719141067c8538b09b95200900.tar.gz CMake-d33b38d4aab6ca719141067c8538b09b95200900.tar.bz2 | |
gitlab-ci: rename some scripts to be Linux-specific
macOS install trees have a different layout and package names.
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4667fa..b821fba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -403,7 +403,7 @@ interruptible: true -.cmake_test_unix_package: &cmake_test_unix_package +.cmake_test_linux_package: &cmake_test_linux_package stage: test-ext script: @@ -420,14 +420,13 @@ interruptible: true -.cmake_test_unix_external: &cmake_test_unix_external +.cmake_test_linux_external: &cmake_test_linux_external stage: test-ext script: - *before_script_unix - .gitlab/ci/sccache.sh - # Allow the server to already be running. - - "sccache --start-server || :" + - 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 @@ -479,7 +478,7 @@ build:centos6-release: test:fedora31-makefiles: <<: - *fedora31_makefiles - - *cmake_test_unix_package + - *cmake_test_linux_package - *linux_builder_tags_qt rules: *rules_settings dependencies: @@ -490,7 +489,7 @@ test:fedora31-makefiles: test:cuda10.2-nvidia: <<: - *cuda10_2_nvidia - - *cmake_test_unix_package + - *cmake_test_linux_package - *linux_builder_tags_cuda rules: *rules_settings dependencies: @@ -521,7 +520,7 @@ test:fedora31-ninja: test:fedora31-ninja-multi: <<: - *fedora31_ninja_multi - - *cmake_test_unix_external + - *cmake_test_linux_external - *linux_builder_tags_qt rules: *rules_settings dependencies: |