From f6f1c5ca1f48603462a85a5f826e3481af3cadd9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 19 Sep 2025 08:05:47 -0400 Subject: [PATCH 1/2] Tests: Teach RunCMake to ignore Xcode an IDERunDestination warning On some Xcode versions, `xcodebuild` may warn: ... xcodebuild[...] IDERunDestination: ... Teach RunCMake to drop such incidental lines before matching against expected output. Backport commit edaa6ed06a (Tests: Teach RunCMake to ignore Xcode an IDERunDestination warning, 2025-09-19, v4.1.2~9^2~1) to CMake 3.31. --- Tests/RunCMake/RunCMake.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 16015619a5..44d4d41b6d 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -210,6 +210,7 @@ function(run_cmake test) "|[^\n]*xcodebuild[^\n]*DVTCoreDeviceEnabledState: DVTCoreDeviceEnabledState_Disabled set via user default" "|[^\n]*xcodebuild[^\n]*DVTPlugInManager" "|[^\n]*xcodebuild[^\n]*DVTSDK: Warning: SDK path collision for path" + "|[^\n]*xcodebuild[^\n]*IDERunDestination: Supported platforms for the buildables in the current scheme is empty" "|[^\n]*xcodebuild[^\n]*Requested but did not find extension point with identifier" "|[^\n]*xcodebuild[^\n]*nil host used in call to allows.*HTTPSCertificateForHost" "|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type" From 9d302ecd4718803428ffdfa253813debc0422e2b Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 7 Oct 2025 14:14:26 -0400 Subject: [PATCH 2/2] ci: update macOS jobs to use Xcode 26.0 in CMake 3.31 branch --- .gitlab/os-macos.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 629d87e2dd..6937a771ad 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-16.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-26.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-16.2 + - xcode-26.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-16.2 + - xcode-26.0 - concurrent .macos_arm64_tags: @@ -158,7 +158,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-16.2 + - xcode-26.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-16.2 + - xcode-26.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-16.2 + - xcode-26.0 - nonconcurrent - finder