Merge topic 'ci-xcode-16.0' into release-3.30

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
This commit is contained in:
Brad King
2024-09-20 14:02:28 +00:00
committed by Kitware Robot
3 changed files with 14 additions and 6 deletions

View File

@@ -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")

View File

@@ -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

View File

@@ -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