[6.4.0] Respect main repository mapping in platform_mappings#19495
[6.4.0] Respect main repository mapping in platform_mappings#19495fmeum wants to merge 1 commit intobazelbuild:release-6.4.0from
platform_mappings#19495Conversation
Fixes bazelbuild#17127 Closes bazelbuild#17133. PiperOrigin-RevId: 563803704 Change-Id: I0f49fbfce624207b81a6ca4f7e564d9f3b525d54
|
@Wyverald @brentleyjones Called it, the weird errors that look completely unrelated but somehow aren't are back on 6.4.0. I don't think it's feasible to backport this. |
|
😢 |
|
Do we know which changes are needed? |
I don't. Based on the test failures I would suspect one of the fixes to built-ins injection, but that is just a wild guess. @brentleyjones If you would like to see this in 6.4.0, you could run a bisect between 6.4.0 and HEAD with this commit applied to find out where the tests start to pass. |
|
My main motivation for this fix landing in 6.4.0 is rules_apple 3.0 requires the use of a platform_mappings file, so this change will allow easier migration for people that also use Bzlmod. |
|
I'm starting the bisect now. |
|
f70e6b8 is the first commit where the tests start to pass with this commit applied. |
|
@brentleyjones Thanks! |
|
I tried, but this is a commit with quite non-trivial merge conflicts in @aoeui We want to cherry-pick f70e6b8 into 6.4.0 to fix some test failures. Do you think that would be feasible or does this commit depend on more changes on master that we would need to cherry-pick as well? |
|
That change only affects test code.
My hunch is that test failures would not be resolved by that change alone
because that only starts the process of migrating test code to the new
implementation, but I'm not 100% sure.
…On Wed, Sep 13, 2023 at 6:06 AM Fabian Meumertzheim < ***@***.***> wrote:
@fmeum <https://github.com/fmeum> Let's try adding f70e6b8
<f70e6b8>
?
I tried, but this is a commit with quite non-trivial merge conflicts in
SkyframeExecutor.java.
@aoeui <https://github.com/aoeui> We would need to cherry-pick f70e6b8
<f70e6b8>
into 6.4.0 to fix some test failures. Do you think that would be feasible
or does this commit depend on more changes on master that we would need to
cherry-pick as well?
—
Reply to this email directly, view it on GitHub
<#19495 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAHNY4VXHPRAWYSXKXLJP7TX2GAQXANCNFSM6AAAAAA4URKJ2E>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
@fmeum @aoeui @brentleyjones @meteorcloudy @Wyverald are we still interested in cherry-picking this to release-6.4.0? The release date for the first candidate for 6.4.0 is next Monday (9/18/2023) |
Interested yes, but I won't realistically be able to work on this. |
|
Hi. RC1 for 6.4.0 is going out this morning (9/18). Looks like the test failures aren't easy to resolve for this one. So we are dropping and closing this PR for now. Thank you! cc: @bazelbuild/triage |
Fixes #17127
Closes #17133.
PiperOrigin-RevId: 563803704
Change-Id: I0f49fbfce624207b81a6ca4f7e564d9f3b525d54