From 7311e4bd4bd3ccd1a91efd7f816748d09f0561b1 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 2 Nov 2024 15:00:53 -0700 Subject: [PATCH] Mac arm is always xlarge --- .github/workflows/build-deps-ci-action.yml | 2 +- .github/workflows/build-deps-onedir.yml | 2 +- .github/workflows/build-packages.yml | 2 +- .github/workflows/build-salt-onedir.yml | 2 +- .github/workflows/test-package-downloads-action.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 832c1296f0c..f17fe17d2ea 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -182,7 +182,7 @@ jobs: name: MacOS needs: - generate-matrix - runs-on: ${{ matrix.distro-slug == 'macos-13-arm64' && 'macos-13-arm64' || matrix.distro-slug }} + runs-on: ${{ matrix.distro-slug == 'macos-13-arm64' && 'macos-13-xlarge' || matrix.distro-slug }} if: ${{ inputs.kind == 'macos' }} timeout-minutes: 90 strategy: diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index f4bc0e708da..934928d14a7 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -97,7 +97,7 @@ jobs: matrix: arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }} runs-on: - - ${{ matrix.arch == 'arm64' && 'macos-13-arm64' || 'macos-12' }} + - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }} env: USE_S3_CACHE: 'false' PIP_INDEX_URL: https://pypi.org/simple diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 640d3b662c2..1132490620f 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -239,7 +239,7 @@ jobs: env: PIP_INDEX_URL: https://pypi.org/simple runs-on: - - ${{ matrix.arch == 'arm64' && 'macos-13' || 'macos-12' }} + - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }} steps: - name: Check Package Signing Enabled diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index e54b50bf6a5..b0f85d05d25 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -104,7 +104,7 @@ jobs: matrix: arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }} runs-on: - - ${{ matrix.arch == 'arm64' && 'macos-13-arm64' || 'macos-12' }} + - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }} env: PIP_INDEX_URL: https://pypi.org/simple diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 1be5911ef73..44dacc62914 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -296,7 +296,7 @@ jobs: name: MacOS needs: - generate-matrix - runs-on: ${{ matrix.distro-slug == 'macos-13-arm64' && 'macos-13-arm64' || matrix.distro-slug }} + runs-on: ${{ matrix.distro-slug == 'macos-13-arm64' && 'macos-13-xlarge' || matrix.distro-slug }} env: USE_S3_CACHE: 'false' PIP_INDEX_URL: https://pypi.org/simple