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

Use macos-14 workers to create libraries #42

Merged
merged 4 commits into from
Sep 7, 2024
Merged

Conversation

janisozaur
Copy link
Member

The macos-14 is already arm-based image

The macos-14 is already arm-based image
@janisozaur
Copy link
Member Author

cc @pdewit @AaronVanGeffen

@janisozaur
Copy link
Member Author

microsoft/vcpkg#39736

@AaronVanGeffen
Copy link
Member

Can we work around the vcpkg libpng issue, somehow? Does it present itself if we do not update the pinned vcpkg commit hash, for example?

@janisozaur
Copy link
Member Author

It's still present in older vcpkg. I'll look into that

@janisozaur
Copy link
Member Author

Note: this only happens in our custom triplet. Using arm64 host to build amd64 package with vcpkg's own triplet works ok.

@duncanspumpkin
Copy link

Note: this only happens in our custom triplet. Using arm64 host to build amd64 package with vcpkg's own triplet works ok.

what is special about our triplet?

@janisozaur
Copy link
Member Author

janisozaur commented Sep 7, 2024

We link statically, vcpkg prefers dynamic linking

Edit: or the other way round ¯\_(ツ)_/¯

@AaronVanGeffen
Copy link
Member

So it was a one-line fix in the triplet, in the end? Nice work!

@janisozaur
Copy link
Member Author

Yeah, it was just that line missing. Once this is approved & merged, I still need to push a tag for new release.

Copy link
Member

@AaronVanGeffen AaronVanGeffen left a comment

Choose a reason for hiding this comment

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

Changes look good to me. Haven't tested the resulting dep bundle, but that can be done once it is hooked up to the OpenRCT2 CI. Could you amend OpenRCT2/OpenRCT2#22601 to that end?

@janisozaur janisozaur merged commit 3ba1772 into master Sep 7, 2024
14 checks passed
@Gymnasiast Gymnasiast deleted the janisozaur-macos-14 branch September 7, 2024 13:05
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