Merge topic 'ci-xcode-13.0' into release-3.21

429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0
75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6578

.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-12.5.app/Contents/Developer"
+        DEVELOPER_DIR: "/Applications/Xcode-13.0.app/Contents/Developer"
         # Avoid conflicting with other projects running on the same machine.
         SCCACHE_SERVER_PORT: 4227
 
@@ -87,7 +87,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos
         - shell
-        - xcode-12.5
+        - xcode-13.0
         - nonconcurrent
 
 .macos_x86_64_builder_tags_package:
@@ -95,7 +95,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos
         - shell
-        - xcode-12.5
+        - xcode-13.0
         - nonconcurrent
         - finder
 
@@ -104,7 +104,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos
         - shell
-        - xcode-12.5
+        - xcode-13.0
         - concurrent
 
 .macos_arm64_builder_tags:
@@ -112,7 +112,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-12.5
+        - xcode-13.0
         - nonconcurrent
 
 .macos_arm64_builder_ext_tags:
@@ -120,7 +120,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-12.5
+        - xcode-13.0
         - concurrent
 
 ## macOS-specific scripts

Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake

@@ -9,8 +9,8 @@ function(verify_architectures file)
     return()
   endif()
 
-  string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out})
-  string(REPLACE "architecture " "" actual "${architectures}")
+  string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out})
+  string(REPLACE "\narchitecture " "" actual "${architectures}")
   list(SORT actual)
 
   set(expected arm64 armv7 i386 x86_64)

Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake

@@ -9,8 +9,8 @@ function(verify_architectures file)
     return()
   endif()
 
-  string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out})
-  string(REPLACE "architecture " "" actual "${architectures}")
+  string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out})
+  string(REPLACE "\narchitecture " "" actual "${architectures}")
   list(SORT actual)
 
   set(expected armv7 x86_64)