echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab-ci: update macOS jobs to use Xcode 16.0

Browse Source 
The `XCTest` fails with Xcode 16.0.
Exclude it pending further investigation.

Issue: #26301
This commit is contained in:
Brad King 2024-09-17 14:23:01 -04:00
parent d31f4b645b
commit 26359076c8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab/ci/ctest_exclusions.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

12
.gitlab/os-macos.yml
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