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

[6.0] Import new Bionic module and Android overlay #1555

Merged
merged 2 commits into from
Jul 15, 2024

Conversation

finagolfin
Copy link
Contributor

@finagolfin finagolfin commented Jul 4, 2024

Explanation: Now that this new overlay was merged into the 6.0 compiler too in swiftlang/swift#74758, this adds the overlay to the seven files that currently import Glibc.

Scope: Add imports on Android only

Issue: None

Original PR: #1550 and #1559

Risk: None

Testing: Passed all CI on trunk, plus on my daily Android CI, finagolfin/swift-android-sdk#151

Reviewer: @ahoppen

@bnbarham, easy review.

@finagolfin finagolfin requested a review from ahoppen as a code owner July 4, 2024 14:14
@ahoppen ahoppen requested a review from bnbarham July 4, 2024 15:33
@ahoppen
Copy link
Member

ahoppen commented Jul 4, 2024

@swift-ci Please test

@finagolfin
Copy link
Contributor Author

Hold off on merging, will let you know next week.

@finagolfin finagolfin changed the title [6.0] Import new Android overlay [6.0] Import new Bionic module and Android overlay Jul 10, 2024
@finagolfin
Copy link
Contributor Author

Alright, pulled in #1559 also, one more CI run and this can go in.

@bnbarham
Copy link
Contributor

@swift-ci please test

@finagolfin
Copy link
Contributor Author

Passed CI, ready for merge.

@bnbarham
Copy link
Contributor

Seems like Windows didn't run :(

@bnbarham
Copy link
Contributor

@swift-ci please test Windows platform

@finagolfin
Copy link
Contributor Author

Seems like Windows didn't run :(

It did, I think the problem is that github doesn't always pick up the results of Windows CI runs.

@bnbarham
Copy link
Contributor

It did, I think the problem is that github doesn't always pick up the results of Windows CI runs.

Yeah, unfortunately merging is blocked for me without the status being picked up.

@ahoppen ahoppen merged commit 74a6f60 into swiftlang:release/6.0 Jul 15, 2024
3 checks passed
@finagolfin finagolfin deleted the release/6.0 branch July 15, 2024 09:54
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