From 3114001843133e676a4b149c5aa4d6ffeafb521e Mon Sep 17 00:00:00 2001
From: Alon Farchy <34091646+afarchy@users.noreply.github.com>
Date: Wed, 2 Sep 2026 13:51:48 -0500
Subject: [PATCH 1/2] Update macOS validation toolchains

---
 .github/workflows/build-options.json | 13 +++++++++++--
 .github/workflows/build.yml          | 16 +++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-options.json b/.github/workflows/build-options.json
index bf29c521..2223c6da 100644
--- a/.github/workflows/build-options.json
+++ b/.github/workflows/build-options.json
@@ -1,5 +1,6 @@
 {
   "os": [
+    "macos-15",
     "macos-latest"
   ],
   "unity-version": [
@@ -16,9 +17,17 @@
   ],
   "xcode-version": [
     "16.3",
-    ""
+    "latest"
   ],
   "exclude": [
+    {
+      "os": "macos-15",
+      "xcode-version": "latest"
+    },
+    {
+      "os": "macos-latest",
+      "xcode-version": "16.3"
+    },
     {
       "unity-version": "2021.x",
       "build-target": "VisionOS"
@@ -28,4 +37,4 @@
       "build-target": "VisionOS"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f66bf020..a088065f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,13 +27,15 @@ jobs:
       BUILD_DIRECTORY: ''
       UNITY_PROJECT_PATH: ${{ github.workspace }}/UnityProject
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - run: 'npm install -g openupm-cli'
-      - uses: RageAgainstThePixel/unity-setup@v1
+      - uses: RageAgainstThePixel/unity-setup@v2
         with:
           version-file: 'None'
           build-targets: ${{ matrix.build-target }}
           unity-version: ${{ matrix.unity-version }}
+          # Hub 3.20+ installs outside the path currently probed by unity-setup.
+          hub-version: '3.14.3'
       - name: Set Build Args
         shell: bash
         run: |
@@ -70,12 +72,12 @@ jobs:
           echo "Creating build directory at $build_directory"
           mkdir -p "$build_directory"
           echo "BUILD_DIRECTORY=$build_directory" >> "$GITHUB_ENV"
-      - uses: RageAgainstThePixel/activate-unity-license@v1
+      - uses: RageAgainstThePixel/activate-unity-license@v2
         with:
-          license: 'Personal'
+          license: personal
           username: ${{ secrets.UNITY_USERNAME }}
           password: ${{ secrets.UNITY_PASSWORD }}
-      - uses: RageAgainstThePixel/create-unity-project@v1
+      - uses: RageAgainstThePixel/create-unity-project@v2
         name: Create Test Project
         with:
           project-name: UnityProject
@@ -83,13 +85,13 @@ jobs:
       - run: openupm add com.utilities.buildpipeline
         name: Add Build Pipeline Package
         working-directory:  ${{ env.UNITY_PROJECT_PATH }}
-      - uses: RageAgainstThePixel/unity-action@v2
+      - uses: RageAgainstThePixel/unity-action@v3
         name: '${{ matrix.build-target }}-Validate'
         with:
           build-target: ${{ matrix.build-target }}
           log-name: '${{ matrix.build-target }}-Validate'
           args: '-quit -nographics -batchmode -executeMethod Utilities.Editor.BuildPipeline.UnityPlayerBuildTools.ValidateProject -importTMProEssentialsAsset'
-      - uses: RageAgainstThePixel/unity-action@v2
+      - uses: RageAgainstThePixel/unity-action@v3
         name: '${{ matrix.build-target }}-Build'
         with:
           build-target: ${{ matrix.build-target }}

From 40fc8e5f62abbf2966b603ff5ee806434b09eda0 Mon Sep 17 00:00:00 2001
From: Alon Farchy <34091646+afarchy@users.noreply.github.com>
Date: Wed, 2 Sep 2026 14:13:37 -0500
Subject: [PATCH 2/2] Use preinstalled macOS 15 platform runtimes

---
 .github/workflows/build-options.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-options.json b/.github/workflows/build-options.json
index 2223c6da..a6b481bc 100644
--- a/.github/workflows/build-options.json
+++ b/.github/workflows/build-options.json
@@ -16,7 +16,7 @@
     "VisionOS"
   ],
   "xcode-version": [
-    "16.3",
+    "16.4",
     "latest"
   ],
   "exclude": [
@@ -26,7 +26,7 @@
     },
     {
       "os": "macos-latest",
-      "xcode-version": "16.3"
+      "xcode-version": "16.4"
     },
     {
       "unity-version": "2021.x",