mirror of
https://github.com/saymrwulf/cryptography.git
synced 2026-05-14 20:37:55 +00:00
backport actions m1 switch to 42.0.x (#10415)
* Check to see if we can use the hosted M1 runners (#10340) * Stop pretending to be x64 on M1 in CI (#10341) --------- Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
This commit is contained in:
parent
c49a7a5271
commit
df314bb182
1 changed files with 2 additions and 3 deletions
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
|
|
@ -222,14 +222,14 @@ jobs:
|
|||
matrix:
|
||||
RUNNER:
|
||||
- {OS: 'macos-13', ARCH: 'x86_64'}
|
||||
- {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
|
||||
- {OS: 'macos-14', ARCH: 'arm64'}
|
||||
PYTHON:
|
||||
- {VERSION: "3.7", NOXSESSION: "tests-nocoverage"}
|
||||
- {VERSION: "3.12", NOXSESSION: "tests"}
|
||||
exclude:
|
||||
# We only test latest Python on arm64. py37 won't work since there's no universal2 binary
|
||||
- PYTHON: {VERSION: "3.7", NOXSESSION: "tests-nocoverage"}
|
||||
RUNNER: {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
|
||||
RUNNER: {OS: 'macos-14', ARCH: 'arm64'}
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
|
||||
|
|
@ -246,7 +246,6 @@ jobs:
|
|||
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
|
||||
with:
|
||||
python-version: ${{ matrix.PYTHON.VERSION }}
|
||||
architecture: 'x64' # we force this right now so that it will install the universal2 on arm64
|
||||
cache: pip
|
||||
cache-dependency-path: ci-constraints-requirements.txt
|
||||
timeout-minutes: 3
|
||||
|
|
|
|||
Loading…
Reference in a new issue