Skip to content
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

Use publicly available Apple Silicon runners #9726

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Use publicly available Apple Silicon runners #9726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb9c9af
Use publicly available Apple Silicon runners
charliermarsh Jan 31, 2024
fda48e1
Swap
charliermarsh Jan 31, 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
9 changes: 2 additions & 7 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
path: dist

macos-x86_64:
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -74,11 +74,6 @@ jobs:
with:
target: x86_64
args: --release --locked --out dist
- name: "Test wheel - x86_64"
run: |
pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
ruff --help
python -m ruff --help
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately we can no longer run the x64_64 wheel (since this is an ARM runner, we're cross-compiling), but I think it's fine and worth it (we already run this test in the Universal branch below).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO if the M1 runner has Rostta2 enabled it should run fine? At least for ruff --help.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lemme look back at what failed...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it was the pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall, saying that the wheel isn't supported for the current platform.

Copy link
Contributor

@messense messense Jan 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, the python interpreter it installed might not be universal2, if it is you can probably use arch -x86_64 python to switch to x86_64 mode.

Anyway it's definitly not a big issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I appreciate you chiming in, you're always so helpful.

- name: "Upload wheels"
uses: actions/upload-artifact@v3
with:
Expand All @@ -98,7 +93,7 @@ jobs:
*.sha256

macos-universal:
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
Expand Down
Loading