From 56c4fb8b3d0ed4cf4d3e2fbcb97f1cfbab2728a8 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 2 Apr 2026 10:39:07 -0400
Subject: [PATCH] ci: Update macos-arm64 jobs to use Xcode 26.4

Xcode 26.4 will not run on macOS 15.7, and Intel-based hosts cannot
be updated past that, so keep macos-x86_64 jobs on Xcode 26.3.
---
 .gitlab/os-macos.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index c4aff0877d..c0ff828f7a 100644
--- a/.gitlab/os-macos.yml
+++ b/.gitlab/os-macos.yml
@@ -5,15 +5,16 @@
 .macos:
     variables:
         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-26.3.app/Contents/Developer"
 
 .macos_arm64:
     extends: .macos
+    variables:
+        DEVELOPER_DIR: "/Applications/Xcode-26.4.app/Contents/Developer"
 
 .macos_x86_64:
     extends: .macos
+    variables:
+        DEVELOPER_DIR: "/Applications/Xcode-26.3.app/Contents/Developer"
 
 ### Build and test
 
@@ -170,7 +171,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-26.3
+        - xcode-26.4
         - nonconcurrent
 
 .macos_arm64_tags_ext:
@@ -178,7 +179,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-26.3
+        - xcode-26.4
         - concurrent
 
 .macos_arm64_tags_package:
@@ -186,7 +187,7 @@
         - cmake # Since this is a bare runner, pin to a project.
         - macos-arm64
         - shell
-        - xcode-26.3
+        - xcode-26.4
         - nonconcurrent
         - finder