Skip to content

[6.3][test][android] Fix one IRGen test on Android CI, from #88056#88177

Merged
finagolfin merged 1 commit into
swiftlang:release/6.3from
finagolfin:droid
Apr 18, 2026
Merged

[6.3][test][android] Fix one IRGen test on Android CI, from #88056#88177
finagolfin merged 1 commit into
swiftlang:release/6.3from
finagolfin:droid

Conversation

@finagolfin
Copy link
Copy Markdown
Member

A recent change in the Android CI build script, swiftlang/swift-docker#528, exposed that this test was only passing for other Android non-AArch64 architectures because AArch64 was built first and that SDK build wasn't removed.

Since we made that change to remove previous SDK builds for 6.3 also, this test will likely start failing on the 6.3 Android CI soon, so bring the fix over to 6.3.

The 6.3 CI appear to be temporarily stopped, so keeping this ready as a draft for when they start up again. I was told by Doug that the usual release branch form is not needed for test-only pulls like this, since this does not affect the build in any way.

…#88056

A recent change in the Android CI build script, swiftlang/swift-docker#528,
exposed that this test was only passing for other Android non-AArch64 architectures
because AArch64 was built first and that SDK build wasn't removed.

Since we made that change to remove previous SDK builds for 6.3 also, this test
will likely start failing on the 6.3 Android CI soon, so bring the fix over to 6.3.
@finagolfin finagolfin requested a review from a team as a code owner March 29, 2026 09:56
@finagolfin finagolfin added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.3 labels Mar 29, 2026
@finagolfin finagolfin marked this pull request as draft March 29, 2026 09:56
@finagolfin finagolfin marked this pull request as ready for review April 17, 2026 02:48
@finagolfin
Copy link
Copy Markdown
Member Author

@shahmishal, this fixes the test failure just seen on the 6.3 CI. Since this only changes an Android test, it represents zero risk to the 6.3 build.

@swift-ci test

@finagolfin
Copy link
Copy Markdown
Member Author

swiftlang/sourcekit-lsp#2606

@swift-ci test windows

@finagolfin
Copy link
Copy Markdown
Member Author

Merging to unblock 6.3 Android CI, no risk from this Android-only test.

@finagolfin finagolfin merged commit 95fbe06 into swiftlang:release/6.3 Apr 18, 2026
6 checks passed
@finagolfin finagolfin deleted the droid branch April 20, 2026 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🍒 release cherry pick Flag: Release branch cherry picks swift 6.3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants