Skip to content

backport actions m1 switch to 42.0.x #10415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex merged 2 commits into from
Feb 18, 2024
Merged

backport actions m1 switch to 42.0.x #10415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b64621b
Check to see if we can use the hosted M1 runners (#10340)
alex Feb 3, 2024
1274f82
Stop pretending to be x64 on M1 in CI (#10341)
alex Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
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