Merge pull request #20291 from Expensify/Rory-UseMacos13

[No QA] Use macos-13 runners for desktop builds (cherry picked from commit 6abef5f)
Expensify · Jun 6, 2023 · 1d25c31 · 1d25c31
1 parent ed9523a
commit 1d25c31
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -3,3 +3,4 @@ self-hosted-runner:
   labels:
     - ubuntu-20.04-64core
     - macos-12-xl
+    - macos-13
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -103,7 +103,11 @@ jobs:
     name: Build and deploy Desktop
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
+<<<<<<< HEAD
     runs-on: macos-12-xl
+=======
+    runs-on: macos-13
+>>>>>>> 6abef5f699 (Merge pull request #20291 from Expensify/Rory-UseMacos13)
     steps:
       # This action checks-out the repository, so the workflow can access it.
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -189,7 +189,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+<<<<<<< HEAD
     runs-on: macos-12-xl
+=======
+    runs-on: macos-13
+>>>>>>> 6abef5f699 (Merge pull request #20291 from Expensify/Rory-UseMacos13)
     steps:
       # This action checks-out the repository, so the workflow can access it.
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8