mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 06:40:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: rename some scripts to be Linux-specific

Browse Source 
macOS install trees have a different layout and package names.
This commit is contained in:
Ben Boeckel
2020-06-12 11:20:03 -04:00
parent 3145264449
commit d33b38d4aa
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab-ci.yml
View File

@@ -403,7 +403,7 @@
interruptible: true interruptible: true
.cmake_test_unix_package: &cmake_test_unix_package .cmake_test_linux_package: &cmake_test_linux_package
stage: test-ext stage: test-ext
script: script:
@@ -420,14 +420,13 @@
interruptible: true interruptible: true
.cmake_test_unix_external: &cmake_test_unix_external .cmake_test_linux_external: &cmake_test_linux_external
stage: test-ext stage: test-ext
script: script:
- *before_script_unix - *before_script_unix
- .gitlab/ci/sccache.sh - .gitlab/ci/sccache.sh
# Allow the server to already be running. - sccache --start-server
- "sccache --start-server || :"
- sccache --show-stats - sccache --show-stats
- "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake" - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake"
- sccache --show-stats - sccache --show-stats
@@ -479,7 +478,7 @@ build:centos6-release:
test:fedora31-makefiles: test:fedora31-makefiles:
<<: <<:
- *fedora31_makefiles - *fedora31_makefiles
- *cmake_test_unix_package - *cmake_test_linux_package
- *linux_builder_tags_qt - *linux_builder_tags_qt
rules: *rules_settings rules: *rules_settings
dependencies: dependencies:
@@ -490,7 +489,7 @@ test:fedora31-makefiles:
test:cuda10.2-nvidia: test:cuda10.2-nvidia:
<<: <<:
- *cuda10_2_nvidia - *cuda10_2_nvidia
- *cmake_test_unix_package - *cmake_test_linux_package
- *linux_builder_tags_cuda - *linux_builder_tags_cuda
rules: *rules_settings rules: *rules_settings
dependencies: dependencies:
@@ -521,7 +520,7 @@ test:fedora31-ninja:
test:fedora31-ninja-multi: test:fedora31-ninja-multi:
<<: <<:
- *fedora31_ninja_multi - *fedora31_ninja_multi
- *cmake_test_unix_external - *cmake_test_linux_external
- *linux_builder_tags_qt - *linux_builder_tags_qt
rules: *rules_settings rules: *rules_settings
dependencies: dependencies: