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.

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

[ci] Separate mac wheels & trigger wheel build from ui #1499

Merged
merged 4 commits into from
Mar 3, 2023

Conversation

Wumpf
Copy link
Member

@Wumpf Wumpf commented Mar 3, 2023

  • remove need for special python wheel tag and use workflow_dispatch for ui controlled wheel publishing instead.
  • Build aarch64 and x64 wheels in parallel, not as a universal wheel

The ui only works once this lands in main, so this is pretty much untested :(
I ensured using act that the yml is at least not broken.

Might fix #1442

Checklist

@Wumpf Wumpf added the 🧑‍💻 dev experience developer experience (excluding CI) label Mar 3, 2023
@Wumpf Wumpf requested a review from jleibs March 3, 2023 15:33
Copy link
Member

@jleibs jleibs left a comment

Choose a reason for hiding this comment

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

Looks like the job is broken?

.github/workflows/python.yml Outdated Show resolved Hide resolved
@jleibs
Copy link
Member

jleibs commented Mar 3, 2023

Were you expecting this to run the wheel job?

@Wumpf
Copy link
Member Author

Wumpf commented Mar 3, 2023

nope. didn't expect that. Fix under the way. And very nice that you found another issue as well!!

@@ -2,18 +2,23 @@ name: CI (Python)

on:
pull_request:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
pull_request:
pull_request:

I think this line needs to go away to not trigger this job.

Copy link
Member Author

Choose a reason for hiding this comment

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

it's still supposed to trigger it because of the linting that we always want to do. But then there is a check later down and I just learned how that was broken :)
Or rather I believe I know now why

Co-authored-by: Jeremy Leibs <jeremy@rerun.io>
Comment on lines 88 to +92
matrix=()

if [[ $TAGGED_OR_MAIN ]]; then
# MacOS build is really slow (>30 mins); uses up a lot of CI minutes
matrix+=('{"platform": "macos", "runs_on": "macos-latest"},')
fi
matrix+=('{"platform": "windows", "runs_on": "windows-latest-8-cores"},')
matrix+=('{"platform": "linux", "runs_on": "ubuntu-latest-16-cores", container: {"image": "rerunio/ci_docker:0.5"}}')
matrix+=('{"platform": "macos", "target": "x86_64-apple-darwin", "runs_on": "macos-latest"},')
matrix+=('{"platform": "macos", "target": "aarch64-apple-darwin", "runs_on": "macos-latest"},')
matrix+=('{"platform": "windows", "target": "x86_64-pc-windows-msvc", "runs_on": "windows-latest-8-cores"},')
matrix+=('{"platform": "linux", "target": "x86_64-unknown-linux-gnu", "runs_on": "ubuntu-latest-16-cores", container: {"image": "rerunio/ci_docker:0.5"}}')
Copy link
Member

Choose a reason for hiding this comment

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

This is a little different from how it normally looks:

https://github.com/rust-windowing/winit/blob/master/.github/workflows/ci.yml#L22-L43

Copy link
Member Author

Choose a reason for hiding this comment

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

let's try this format instead, looks cleaner

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, now that it's not dynamically generated based on an env-variable, seems like we can clean it up.

Copy link
Member

Choose a reason for hiding this comment

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

That's also something we might want to punt on though since this matrix-CI-builder mechanism has been working so far and restructuring the job graph is a good way to end up debugging job-graphs over the weekend.

Copy link
Member Author

Choose a reason for hiding this comment

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

.. in a separate PR!

@Wumpf Wumpf merged commit c8a931c into main Mar 3, 2023
@Wumpf Wumpf deleted the andreas/separate-mac-wheels branch March 3, 2023 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🧑‍💻 dev experience developer experience (excluding CI)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't build universal wheels on Mac
3 participants