diff options
| author | Brad King <brad.king@kitware.com> | 2024-09-20 14:02:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-09-20 14:02:53 (GMT) |
| commit | b9eb9cfbac306a2f4a26f5ddc3a05602c4a96a31 (patch) | |
| tree | 4e34b70371d93077cde06b41c172a9208dbea11b /.gitlab | |
| parent | 7e26c7cad9d0e06a72ec893959c34dcdb8977108 (diff) | |
| parent | cc293b4963ab703a5a25481eef3e97f04d4e7fbb (diff) | |
| download | CMake-b9eb9cfbac306a2f4a26f5ddc3a05602c4a96a31.zip CMake-b9eb9cfbac306a2f4a26f5ddc3a05602c4a96a31.tar.gz CMake-b9eb9cfbac306a2f4a26f5ddc3a05602c4a96a31.tar.bz2 | |
Merge topic 'ci-xcode-16.0'
cc293b4963 ci: Run RunCMake.ExternalProject serially in macos-x86_64 Xcode job
26359076c8 gitlab-ci: update macOS jobs to use Xcode 16.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9830
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_macos_x86_64_xcode.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/ctest_exclusions.cmake | 7 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 12 |
3 files changed, 14 insertions, 6 deletions
diff --git a/.gitlab/ci/configure_macos_x86_64_xcode.cmake b/.gitlab/ci/configure_macos_x86_64_xcode.cmake index 1b976d2..f1b91ec 100644 --- a/.gitlab/ci/configure_macos_x86_64_xcode.cmake +++ b/.gitlab/ci/configure_macos_x86_64_xcode.cmake @@ -1,2 +1,3 @@ +set(CMake_TEST_RunCMake_ExternalProject_RUN_SERIAL ON CACHE BOOL "") 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 a2789c3..e9c148f 100644 --- a/.gitlab/ci/ctest_exclusions.cmake +++ b/.gitlab/ci/ctest_exclusions.cmake @@ -13,6 +13,13 @@ if (CTEST_CMAKE_GENERATOR MATCHES "Visual Studio") "^ExternalProjectUpdateSetup$") endif () +if (CTEST_CMAKE_GENERATOR MATCHES "Xcode") + list(APPEND test_exclusions + # FIXME(#26301): The XCTest fails with Xcode 16.0. + "^XCTest$" + ) +endif () + if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "_asan") list(APPEND test_exclusions CTestTest2 # crashes on purpose diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 527923e..ccddfe9 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -7,7 +7,7 @@ GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID" # TODO: Factor this out so that each job selects the Xcode version to # use so that different versions can be tested in a single pipeline. - DEVELOPER_DIR: "/Applications/Xcode-15.4.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-16.0.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -142,7 +142,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.4 + - xcode-16.0 - nonconcurrent .macos_x86_64_tags_ext: @@ -150,7 +150,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 - shell - - xcode-15.4 + - xcode-16.0 - concurrent .macos_arm64_tags: @@ -158,7 +158,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.4 + - xcode-16.0 - nonconcurrent .macos_arm64_tags_ext: @@ -166,7 +166,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.4 + - xcode-16.0 - concurrent .macos_arm64_tags_package: @@ -174,7 +174,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-15.4 + - xcode-16.0 - nonconcurrent - finder |