diff options
| -rw-r--r-- | .gitlab-ci.yml | 44 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_makefiles.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_xcode.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/ctest_exclusions.cmake | 3 |
6 files changed, 45 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4667fa..438510c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,6 +127,13 @@ CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" +.macos_xcode: &macos_xcode + extends: .macos + + variables: + CMAKE_CONFIGURATION: macos_xcode + CMAKE_GENERATOR: Xcode + .windows: &windows variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci ext\\$CI_CONCURRENT_ID" @@ -403,7 +410,7 @@ interruptible: true -.cmake_test_unix_package: &cmake_test_unix_package +.cmake_test_linux_package: &cmake_test_linux_package stage: test-ext script: @@ -420,7 +427,20 @@ 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 + - 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_macos_external: &cmake_test_macos_external stage: test-ext script: @@ -429,7 +449,7 @@ # 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" + - "$LAUNCHER build/install/CMake.app/Contents/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake" - sccache --show-stats interruptible: true @@ -479,7 +499,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 +510,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 +541,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: @@ -541,6 +561,7 @@ test:macos-ninja: <<: - *macos_ninja - *cmake_test_unix + - *cmake_test_artifacts - *macos_builder_tags rules: *rules_settings dependencies: @@ -567,6 +588,17 @@ test:macos-makefiles: needs: - build:macos-makefiles +test:macos-xcode: + <<: + - *macos_xcode + - *cmake_test_macos_external + - *macos_builder_ext_tags + rules: *rules_settings + dependencies: + - test:macos-ninja + needs: + - test:macos-ninja + build:windows-vs2019-x64-ninja: <<: - *windows_vs2019_x64_ninja diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake index 3589475..bd5902b 100644 --- a/.gitlab/ci/configure_macos_common.cmake +++ b/.gitlab/ci/configure_macos_common.cmake @@ -7,5 +7,3 @@ set(Java_JAVAC_EXECUTABLE "" CACHE FILEPATH "") set(Java_JAR_EXECUTABLE "" CACHE FILEPATH "") set(BUILD_QtDialog ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_makefiles.cmake b/.gitlab/ci/configure_macos_makefiles.cmake index 0f4f194..85f67b5 100644 --- a/.gitlab/ci/configure_macos_makefiles.cmake +++ b/.gitlab/ci/configure_macos_makefiles.cmake @@ -1 +1,2 @@ include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_ninja.cmake b/.gitlab/ci/configure_macos_ninja.cmake index 0f4f194..85f67b5 100644 --- a/.gitlab/ci/configure_macos_ninja.cmake +++ b/.gitlab/ci/configure_macos_ninja.cmake @@ -1 +1,2 @@ include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_xcode.cmake b/.gitlab/ci/configure_macos_xcode.cmake new file mode 100644 index 0000000..1b976d2 --- /dev/null +++ b/.gitlab/ci/configure_macos_xcode.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake index eb9b724..b885a6a 100644 --- a/.gitlab/ci/ctest_exclusions.cmake +++ b/.gitlab/ci/ctest_exclusions.cmake @@ -1,4 +1,7 @@ set(test_exclusions + # This test hits global resources and can be handled by nightly testing. + # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4769 + "^BundleGeneratorTest$" ) if (CTEST_CMAKE_GENERATOR MATCHES "Visual Studio") |