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

Update macos version in github actions #9329

Merged
merged 3 commits into from
Jun 15, 2024
Merged

Conversation

jepler
Copy link
Member

@jepler jepler commented Jun 12, 2024

Move from 11 (deprecated) to 12 (the oldest non-deprecated)

Because the artifacts formerly had the macos version number in the
mpy-cross binary filename, we have to change the binary name anyway.
Rename it without the macos version (e.g., mpy-cross-macos-x64 instead of
mpy-cross-macos-11-x64)

https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/

Closes: #9328

Move from 11 (deprecated) to 12 (the oldest non-deprecated)

Because the artifacts formerly had the macos version number in the
mpy-cross binary filename, we have to change the binary name anyway.
Rename it without the macos version (e.g., mpy-cross-macos-x64 instead of
mpy-cros-macos-11-x64)

https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/

Closes: adafruit#9328
@jepler jepler requested a review from dhalbert June 14, 2024 01:11
@jepler
Copy link
Member Author

jepler commented Jun 14, 2024

This also adds a new dependency on setuptools, needed for the silabs port when using python 3.12 and newer, which removed distutils

Copy link

@bill88t bill88t left a comment

Choose a reason for hiding this comment

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

Removing the version name from the file itself but not the folder isn't ideal.
I know there is a macos folder already, but can't that be renamed to something else so that macos is used for this?

@jepler
Copy link
Member Author

jepler commented Jun 14, 2024

@bill88t thanks, fixed

Copy link

@bill88t bill88t left a comment

Choose a reason for hiding this comment

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

Looks good!

Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

Thank you for working this out. I won't merge in case we want to stage this with other PR's that will adjust the names and paths accordingly.

@jepler
Copy link
Member Author

jepler commented Jun 15, 2024

I don't think there's anything we need to take care to do at the same moment. Until changed, for example, circuitpython_build_tools will always use mpy-cross from 9.0.0-alpha.2 (!) for creating its 9.x mpy files.

If we can drop 8.x from circuitpython_build_tools at the same time as we add 9.1 or 10, we can change it then to simply use the new path. If we need to keep 8.x support we'll need to add some version dependent checking for the mpy cross location. but I think this can all be handled in its own time and based on the issue I filed in circuitpython_build_tools.

@jepler jepler merged commit dfafbc9 into adafruit:9.0.x Jun 15, 2024
496 checks passed
@jepler jepler deleted the deprecated-os11 branch June 15, 2024 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants