Skip to content

Commit df314bb

Browse files
reaperhulkalex
andauthored
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 <[email protected]>
1 parent c49a7a5 commit df314bb

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

.github/workflows/ci.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,14 @@ jobs:
222222
matrix:
223223
RUNNER:
224224
- {OS: 'macos-13', ARCH: 'x86_64'}
225-
- {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
225+
- {OS: 'macos-14', ARCH: 'arm64'}
226226
PYTHON:
227227
- {VERSION: "3.7", NOXSESSION: "tests-nocoverage"}
228228
- {VERSION: "3.12", NOXSESSION: "tests"}
229229
exclude:
230230
# We only test latest Python on arm64. py37 won't work since there's no universal2 binary
231231
- PYTHON: {VERSION: "3.7", NOXSESSION: "tests-nocoverage"}
232-
RUNNER: {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'}
232+
RUNNER: {OS: 'macos-14', ARCH: 'arm64'}
233233
timeout-minutes: 15
234234
steps:
235235
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
@@ -246,7 +246,6 @@ jobs:
246246
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
247247
with:
248248
python-version: ${{ matrix.PYTHON.VERSION }}
249-
architecture: 'x64' # we force this right now so that it will install the universal2 on arm64
250249
cache: pip
251250
cache-dependency-path: ci-constraints-requirements.txt
252251
timeout-minutes: 3

0 commit comments

Comments
 (0)