From 6f53c20d65159616db06633f35a328eb24a7565f Mon Sep 17 00:00:00 2001
From: Adam Horodyski <42047036+adhorodyski@users.noreply.github.com>
Date: Mon, 18 Aug 2025 15:13:06 +0200
Subject: [PATCH 1/5] fix: lock remote-build-is to use ios@16.2

Followup to the new macos-15 policy rollout https://github.com/actions/runner-images/releases/tag/macos-15%2F20250811.1688
---
 .github/workflows/remote-build-ios.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml
index c207d468f404..7691c013623f 100644
--- a/.github/workflows/remote-build-ios.yml
+++ b/.github/workflows/remote-build-ios.yml
@@ -13,6 +13,8 @@ concurrency:
 jobs:
   build:
     runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-15-xlarge' || 'macos-15' }}
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_16.2.0.app/Contents/Developer
     strategy:
       fail-fast: false
       matrix:

From 1825e03fa436bea0ef41059c8bcaa94b212dceba Mon Sep 17 00:00:00 2001
From: Adam Horodyski <42047036+adhorodyski@users.noreply.github.com>
Date: Mon, 18 Aug 2025 15:31:42 +0200
Subject: [PATCH 2/5] fix: use macos-14 instead of macos-15

---
 .github/workflows/remote-build-ios.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml
index 7691c013623f..3771d3837c45 100644
--- a/.github/workflows/remote-build-ios.yml
+++ b/.github/workflows/remote-build-ios.yml
@@ -12,9 +12,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-15-xlarge' || 'macos-15' }}
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_16.2.0.app/Contents/Developer
+    runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-14-xlarge' || 'macos-14' }}
     strategy:
       fail-fast: false
       matrix:

From 011ef883958745e49f5b426086b57f4057e584fb Mon Sep 17 00:00:00 2001
From: Adam Horodyski <42047036+adhorodyski@users.noreply.github.com>
Date: Mon, 18 Aug 2025 17:06:34 +0200
Subject: [PATCH 3/5] fix: temp install xcode 16.4

---
 .github/workflows/remote-build-ios.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml
index 3771d3837c45..6c800f40e27f 100644
--- a/.github/workflows/remote-build-ios.yml
+++ b/.github/workflows/remote-build-ios.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-14-xlarge' || 'macos-14' }}
+    runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-15-xlarge' || 'macos-15' }}
     strategy:
       fail-fast: false
       matrix:
@@ -32,6 +32,10 @@ jobs:
           submodules: ${{ matrix.is_hybrid_build || false }}
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
+      # Temporary workaround until https://github.com/actions/runner-images/issues/12758 is fixed
+      - name: Install XCode 16
+        run: sudo xcode-select --switch /Applications/Xcode_16.4.app
+
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
         with:

From dce6f1bbfb4f3049de969124299f4eab076e0dcd Mon Sep 17 00:00:00 2001
From: Adam Horodyski <42047036+adhorodyski@users.noreply.github.com>
Date: Mon, 18 Aug 2025 18:42:11 +0200
Subject: [PATCH 4/5] Update remote-build-ios.yml

---
 .github/workflows/remote-build-ios.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml
index 6c800f40e27f..272726abc480 100644
--- a/.github/workflows/remote-build-ios.yml
+++ b/.github/workflows/remote-build-ios.yml
@@ -13,6 +13,8 @@ concurrency:
 jobs:
   build:
     runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-15-xlarge' || 'macos-15' }}
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_16.4.0.app/Contents/Developer
     strategy:
       fail-fast: false
       matrix:
@@ -32,10 +34,6 @@ jobs:
           submodules: ${{ matrix.is_hybrid_build || false }}
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      # Temporary workaround until https://github.com/actions/runner-images/issues/12758 is fixed
-      - name: Install XCode 16
-        run: sudo xcode-select --switch /Applications/Xcode_16.4.app
-
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
         with:

From 7d58d0c8cb20f800e62d25f32275f8b7fd07c663 Mon Sep 17 00:00:00 2001
From: Adam Horodyski <42047036+adhorodyski@users.noreply.github.com>
Date: Mon, 18 Aug 2025 20:21:14 +0200
Subject: [PATCH 5/5] fix: testBuild workflow to run on xcode@16.4

---
 .github/workflows/testBuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 5a3be3f992a4..103c4cd0281b 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -369,7 +369,7 @@ jobs:
     if: ${{ inputs.IOS }}
     needs: [prep, getMobileExpensifyPR, getMobileExpensifyRef]
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.2.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.4.0.app/Contents/Developer
     runs-on: macos-15-xlarge
     outputs:
       IOS_PATH: ${{ steps.export-ios-path.outputs.IOS_PATH }}
@@ -519,4 +519,4 @@ jobs:
           ANDROID: ${{ needs.androidHybrid.result }}
           IOS: ${{ needs.iosHybrid.result }}
           ANDROID_LINK: ${{ needs.androidHybrid.outputs.S3_APK_PATH }}
-          IOS_LINK: ${{ needs.iosHybrid.outputs.IOS_PATH }}
\ No newline at end of file
+          IOS_LINK: ${{ needs.iosHybrid.outputs.IOS_PATH }}