From a5693b03506389de9500ee0788d335f35923763a Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 24 Oct 2023 16:01:54 -0600
Subject: [PATCH 1/3] Try to run macos 13

---
 .github/actionlint.yaml         | 1 +
 .github/workflows/testBuild.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 9a314079362c..cd19a46b6a88 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -3,3 +3,4 @@ self-hosted-runner:
   labels:
     - ubuntu-latest-xl
     - macos-12-xl
+    - macos-13-xlarge
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 6ded44d7059f..d00aeb64d58e 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -133,7 +133,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-    runs-on: macos-12-xl
+    runs-on: macos-13-xlarge
     steps:
       # This action checks-out the repository, so the workflow can access it.
       - name: Checkout
@@ -218,7 +218,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-    runs-on: macos-12-xl
+    runs-on: macos-13-xlarge
     steps:
       - name: Checkout
         uses: actions/checkout@v3

From f2c23fd8f50f31e9edb472192190b7c88960f286 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 24 Oct 2023 16:09:02 -0600
Subject: [PATCH 2/3] Update `ruby/setup-ruby`

---
 .github/actions/composite/buildAndroidAPK/action.yml | 2 +-
 .github/workflows/platformDeploy.yml                 | 4 ++--
 .github/workflows/testBuild.yml                      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/composite/buildAndroidAPK/action.yml b/.github/actions/composite/buildAndroidAPK/action.yml
index fc280ab2a223..4f466be84a68 100644
--- a/.github/actions/composite/buildAndroidAPK/action.yml
+++ b/.github/actions/composite/buildAndroidAPK/action.yml
@@ -11,7 +11,7 @@ runs:
   steps:
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
-    - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+    - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
       with:
         ruby-version: "2.7"
         bundler-cache: true
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 1105f78da27a..4fd3851d99ee 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -67,7 +67,7 @@ jobs:
         uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -190,7 +190,7 @@ jobs:
         uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
           ruby-version: '2.7'
           bundler-cache: true
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index d00aeb64d58e..7bd7e13bc82b 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -86,7 +86,7 @@ jobs:
         uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -157,7 +157,7 @@ jobs:
         run: sudo xcode-select -switch /Applications/Xcode_14.2.app
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
           ruby-version: '2.7'
           bundler-cache: true

From e69585eea747d9ac0185020607c7983ad19334c6 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 24 Oct 2023 16:33:09 -0600
Subject: [PATCH 3/3] Use `macos-13-xlarge` instead of `macos-12-xl` everywhere

---
 .github/actionlint.yaml              | 1 -
 .github/workflows/platformDeploy.yml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index cd19a46b6a88..f3a5c8dc4314 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -2,5 +2,4 @@
 self-hosted-runner:
   labels:
     - ubuntu-latest-xl
-    - macos-12-xl
     - macos-13-xlarge
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 4fd3851d99ee..a18961b24389 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -139,7 +139,7 @@ jobs:
     name: Build and deploy Desktop
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on: macos-12-xl
+    runs-on: macos-13-xlarge
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -178,7 +178,7 @@ jobs:
     name: Build and deploy iOS
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on: macos-12-xl
+    runs-on: macos-13-xlarge
     steps:
       - name: Checkout
         uses: actions/checkout@v3