Skip to content

Commit

Permalink
backport actions m1 switch to 42.0.x (#10415)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
reaperhulk and alex authored Feb 18, 2024
1 parent c49a7a5 commit df314bb
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit df314bb

Please sign in to comment.