Skip to content

Conversation

finagolfin
Copy link
Member

@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
Member 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
Member 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
Member 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
Member 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
@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

3 participants