Update net11.0 merge-flow target to release/11.0.1xx-preview6 - #36188
Merged
Conversation
The arcade inter-branch merge workflow reads github-merge-flow-release-11.jsonc from the default branch (main), where MergeToBranch was still pointing at the stale release/11.0.1xx-preview4. The earlier bump to preview6 (#36110) only landed on the net11.0 branch, which the workflow never reads, so the net11.0 -> release down-merge PR was never generated for preview6. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 36188Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 36188" |
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the net11.0 merge-flow configuration so the Merge net11.0 to next release automation targets the current preview release branch (release/11.0.1xx-preview6) instead of the stale preview4 branch.
Changes:
- Bump
MergeToBranchingithub-merge-flow-release-11.jsoncfromrelease/11.0.1xx-preview4torelease/11.0.1xx-preview6.
Show a summary per file
| File | Description |
|---|---|
| github-merge-flow-release-11.jsonc | Updates merge-flow target branch for net11.0 down-merge automation to release/11.0.1xx-preview6. |
Copilot's findings
- Files reviewed: 1/1 changed files
- Comments generated: 0
github-actions
Bot
added
the
area-infrastructure
This was referenced Jun 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!
Description
Fixes the broken
net11.0→ release down-merge automation. TheMerge net11.0 to next releaseworkflow (.github/workflows/merge-net11-to-release.yml) delegates to the shared arcadeinter-branch-merge-base.yml, which reads its merge-flow configuration from the default branch (main) — theconfiguration_file_branchinput defaults to'main'.On
main,github-merge-flow-release-11.jsoncstill pointed at the stalerelease/11.0.1xx-preview4. The bump topreview6(#36110) was applied only to the copy on thenet11.0branch, which the workflow never reads. As a result the workflow targetedpreview4, tried to update the leftover stalemerge/net11.0-to-release/11.0.1xx-preview4branch, hit a non-fast-forward push rejection, and exited 1 on everypush-from-net11.0run — so nopreview6down-merge PR was ever created.This one-line change updates the main copy to
release/11.0.1xx-preview6so the automation targets the current preview release branch.Evidence
28241084988Merge step:read-configuration.ps1 -ConfigurationFileBranch main … github-merge-flow-release-11.jsonc→[MergeToBranch, release/11.0.1xx-preview4], then non-fast-forward push rejection →WARNING: Failed to update existing PR→ exit code 1.git show origin/main:github-merge-flow-release-11.jsonc→preview4;git show origin/net11.0:…→preview6(unread by the workflow).release/11.0.1xx-preview6exists on origin, so this was a stale-config issue, not a missing-branch issue.Follow-up (not in this PR)
Stale leftover branches
merge/net11.0-to-release/11.0.1xx-preview4and…preview3(and stale PR #34875) can be cleaned up separately. The misleading comments inmerge-net11-to-release.yml(claiming the config is read fromnet11.0, and that the daily schedule works fromnet11.0) are also worth revisiting, since scheduled workflows and config reads both happen from the default branch.