From 26359076c88cda50e0954b3d4219175b278c7e44 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 17 Sep 2024 14:23:01 -0400
Subject: gitlab-ci: update macOS jobs to use Xcode 16.0

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

Issue: #26301
---
 .gitlab/ci/ctest_exclusions.cmake |  7 +++++++
 .gitlab/os-macos.yml              | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake
index ed5e1dd..5d3ebae 100644
--- a/.gitlab/ci/ctest_exclusions.cmake
+++ b/.gitlab/ci/ctest_exclusions.cmake
@@ -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
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index 527923e..ccddfe9 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-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
 
-- 
cgit v0.12