From 27f41c696d55886ce0678747a82df24530483813 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Wed, 25 Oct 2023 13:21:42 -1000 Subject: [PATCH] Merge pull request #30402 from Expensify/andrew-desktop-intel Build MacOS Desktop from Intel machines in order to support x86 (cherry picked from commit 0f1ad507883bd6ca7ba007d01d82c8ee8dd3b334) --- .github/actionlint.yaml | 1 + .github/workflows/platformDeploy.yml | 2 +- .github/workflows/testBuild.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index f3a5c8dc4314..cd19a46b6a88 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -2,4 +2,5 @@ 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 a18961b24389..d18a0a383ed6 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-13-xlarge + runs-on: macos-12-xl steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index 7bd7e13bc82b..beb5d4e2f530 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -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-13-xlarge + runs-on: macos-12-xl steps: - name: Checkout uses: actions/checkout@v3