Skip to content

[6.1] Fix the Android build #494

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

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

finagolfin
Copy link
Member

Explanation: This import was missed and the Android cross-compile complains.

Scope: A single import for C functions

Issue: None

Original PRs: #492

Risk: Practically non-existent

Testing: Passed all CI on trunk

Reviewer: @owenv

This pull from @jakepetroules was merged right after the 6.1 branch: I don't want to have to apply it for the 6.1 builds on my Android CI for the next year.

@finagolfin
Copy link
Member Author

@bnbarham, need a CI run here.

@finagolfin
Copy link
Member Author

@swift-ci test

@bnbarham
Copy link
Contributor

bnbarham commented Dec 4, 2024

need a CI run here

Sorry, I've been off and only catching up now. But looks like you can now run now 🥳!

@finagolfin finagolfin enabled auto-merge (rebase) December 4, 2024 20:53
@finagolfin
Copy link
Member Author

@swift-ci test windows

@finagolfin
Copy link
Member Author

@shahmishal, does something need to be setup to get the 6.1 branch of this repo tested on Windows, because my above attempts so far don't appear to do anything?

@shahmishal
Copy link
Member

Please try again, I just fixed the issue with Windows trigger.

@finagolfin
Copy link
Member Author

@swift-ci test windows

@finagolfin
Copy link
Member Author

Yep, kicked off again. 👍 Thanks, Mishal, will let you know if I see any other problems.

@finagolfin finagolfin merged commit 5cd61a7 into swiftlang:release/6.1 Dec 5, 2024
3 checks passed
@finagolfin finagolfin deleted the release/6.1 branch December 6, 2024 01:36
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.

5 participants