Parcourir la source

Merge topic 'ci-xcode-26' into release-4.1

965a12cb8a ci: update macOS jobs to use Xcode 26.0
edaa6ed06a Tests: Teach RunCMake to ignore Xcode an IDERunDestination warning

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11209
Brad King il y a 4 mois
Parent
commit
72fcfe5b36
2 fichiers modifiés avec 7 ajouts et 6 suppressions
  1. 6 6
      .gitlab/os-macos.yml
  2. 1 0
      Tests/RunCMake/RunCMake.cmake

+ 6 - 6
.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.4.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
 
@@ -144,7 +144,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-x86_64
         - shell
-        - xcode-16.4
+        - xcode-26.0
         - nonconcurrent
 
 .macos_x86_64_tags_ext:
@@ -152,7 +152,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-x86_64
         - shell
-        - xcode-16.4
+        - xcode-26.0
         - concurrent
 
 .macos_arm64_tags:
@@ -160,7 +160,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-16.4
+        - xcode-26.0
         - nonconcurrent
 
 .macos_arm64_tags_ext:
@@ -168,7 +168,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-16.4
+        - xcode-26.0
         - concurrent
 
 .macos_arm64_tags_package:
@@ -176,7 +176,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-16.4
+        - xcode-26.0
         - nonconcurrent
         - finder
 

+ 1 - 0
Tests/RunCMake/RunCMake.cmake

@@ -218,6 +218,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"