From 2e2612dc9526563d4601e4688a49b1bb429c1350 Mon Sep 17 00:00:00 2001
From: PatTheMav <PatTheMav@users.noreply.github.com>
Date: Tue, 26 May 2026 19:14:07 +0200
Subject: [PATCH] CI: Update macos runners and used Xcode version

In preparation for macOS 27 and to fix existing build errors when
Swift 6 (rather than Swift 6.1 is used) to build the project, force use
of macOS 26 runners as well as Xcode 26.5 for CI.
---
 .github/workflows/analyze-project.yaml | 6 +++---
 .github/workflows/build-project.yaml   | 6 +++---
 .github/workflows/check-format.yaml    | 2 +-
 .github/workflows/dispatch.yaml        | 4 ++--
 .github/workflows/publish.yaml         | 2 +-
 .github/workflows/push.yaml            | 2 +-
 .github/workflows/scheduled.yaml       | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/analyze-project.yaml b/.github/workflows/analyze-project.yaml
index 74949fb2b..b37236746 100644
--- a/.github/workflows/analyze-project.yaml
+++ b/.github/workflows/analyze-project.yaml
@@ -41,7 +41,7 @@ jobs:
 
   macos:
     name: macOS 🍏 (clang-analyze)
-    runs-on: macos-15
+    runs-on: macos-26
     defaults:
       run:
         shell: zsh --no-rcs --errexit --pipefail {0}
@@ -57,8 +57,8 @@ jobs:
           : Set Up Environment 🔧
           if (( ${+RUNNER_DEBUG} )) setopt XTRACE
 
-          print '::group::Enable Xcode 16.4'
-          sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer
+          print '::group::Enable Xcode 26.5'
+          sudo xcode-select --switch /Applications/Xcode_26.5.app/Contents/Developer
           print '::endgroup::'
 
           print '::group::Clean Homebrew Environment'
diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
index 741275758..6c98ef9e6 100644
--- a/.github/workflows/build-project.yaml
+++ b/.github/workflows/build-project.yaml
@@ -59,7 +59,7 @@ jobs:
 
   macos-build:
     name: macOS 🍏
-    runs-on: macos-15
+    runs-on: macos-26
     needs: check-event
     strategy:
       fail-fast: false
@@ -80,8 +80,8 @@ jobs:
           : Set Up Environment 🔧
           if (( ${+RUNNER_DEBUG} )) setopt XTRACE
 
-          print '::group::Enable Xcode 26.1'
-          sudo xcode-select --switch /Applications/Xcode_26.1.app/Contents/Developer
+          print '::group::Enable Xcode 26.5'
+          sudo xcode-select --switch /Applications/Xcode_26.5.app/Contents/Developer
           print '::endgroup::'
 
           print '::group::Clean Homebrew Environment'
diff --git a/.github/workflows/check-format.yaml b/.github/workflows/check-format.yaml
index de770e083..ad59fe389 100644
--- a/.github/workflows/check-format.yaml
+++ b/.github/workflows/check-format.yaml
@@ -15,7 +15,7 @@ jobs:
           failCondition: error
 
   swift-format:
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
diff --git a/.github/workflows/dispatch.yaml b/.github/workflows/dispatch.yaml
index 13081ddf1..a1d9ce765 100644
--- a/.github/workflows/dispatch.yaml
+++ b/.github/workflows/dispatch.yaml
@@ -39,7 +39,7 @@ jobs:
   services-validation:
     name: Validate Services 🕵️
     if: github.repository_owner == 'obsproject' && inputs.job == 'services'
-    runs-on: macos-15
+    runs-on: macos-26
     permissions:
       checks: write
       contents: write
@@ -73,7 +73,7 @@ jobs:
   steam-upload:
     name: Upload Steam Builds 🚂
     if: github.repository_owner == 'obsproject' && inputs.job == 'steam'
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: ./.github/actions/steam-upload
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index e5bf8ef61..bda7ed4ed 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -230,7 +230,7 @@ jobs:
     name: Upload Steam Builds 🚂
     needs: check-tag
     if: github.repository_owner == 'obsproject' && fromJSON(needs.check-tag.outputs.validTag)
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: ./.github/actions/steam-upload
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index 9f43abc61..4efffa2d3 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -139,7 +139,7 @@ jobs:
   create-appcast:
     name: Create Sparkle Appcast 🎙️
     if: github.repository_owner == 'obsproject' && github.ref_type == 'tag'
-    runs-on: macos-15
+    runs-on: macos-26
     needs: build-project
     strategy:
       fail-fast: false
diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml
index e08dbdcb6..d0e8f12d9 100644
--- a/.github/workflows/scheduled.yaml
+++ b/.github/workflows/scheduled.yaml
@@ -13,7 +13,7 @@ jobs:
   services-availability:
     name: Check Service Availability 🛜
     if: github.repository_owner == 'obsproject'
-    runs-on: macos-15
+    runs-on: macos-26
     permissions:
       checks: write
       contents: write
@@ -163,7 +163,7 @@ jobs:
     name: Upload Steam Builds 🚂
     needs: [build-project]
     if: github.repository_owner == 'obsproject'
-    runs-on: macos-15
+    runs-on: macos-26
     defaults:
       run:
         shell: zsh --no-rcs --errexit --pipefail {0}