mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Mac arm is always xlarge
This commit is contained in:
parent
ea95ee18d9
commit
7311e4bd4b
5 changed files with 5 additions and 5 deletions
2
.github/workflows/build-deps-ci-action.yml
vendored
2
.github/workflows/build-deps-ci-action.yml
vendored
|
@ -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:
|
||||
|
|
2
.github/workflows/build-deps-onedir.yml
vendored
2
.github/workflows/build-deps-onedir.yml
vendored
|
@ -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
|
||||
|
|
2
.github/workflows/build-packages.yml
vendored
2
.github/workflows/build-packages.yml
vendored
|
@ -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
|
||||
|
|
2
.github/workflows/build-salt-onedir.yml
vendored
2
.github/workflows/build-salt-onedir.yml
vendored
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue