Update net11.0 merge-flow target to release/11.0.1xx-preview6 - #36110
Merged
Conversation
The inter-branch merge-flow config still pointed at preview4. Bump it to preview6 (the current latest release branch) so net11.0 merges down to the correct preview branch. 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 -- 36110Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 36110" |
github-actions
Bot
added
the
area-infrastructure
This was referenced Jun 25, 2026
Closed
PureWeen
added a commit
that referenced
this pull request
Jun 27, 2026
<!-- Please let the below note in for people that find this PR --> > [!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](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) 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. The `Merge net11.0 to next release` workflow (`.github/workflows/merge-net11-to-release.yml`) delegates to the shared arcade `inter-branch-merge-base.yml`, which reads its merge-flow configuration from the **default branch (`main`)** — the `configuration_file_branch` input [defaults to `'main'`](https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml). On `main`, `github-merge-flow-release-11.jsonc` still pointed at the stale `release/11.0.1xx-preview4`. The bump to `preview6` (#36110) was applied only to the copy on the `net11.0` branch, which the workflow never reads. As a result the workflow targeted `preview4`, tried to update the leftover stale `merge/net11.0-to-release/11.0.1xx-preview4` branch, hit a non-fast-forward push rejection, and exited 1 on every `push`-from-`net11.0` run — so no `preview6` down-merge PR was ever created. This one-line change updates the **main** copy to `release/11.0.1xx-preview6` so the automation targets the current preview release branch. ### Evidence - Run [`28241084988`](https://github.com/dotnet/maui/actions/runs/28241084988) Merge 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-preview6` exists 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-preview4` and `…preview3` (and stale PR #34875) can be cleaned up separately. The misleading comments in `merge-net11-to-release.yml` (claiming the config is read from `net11.0`, and that the daily schedule works from `net11.0`) are also worth revisiting, since scheduled workflows and config reads both happen from the default branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
1 participant
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
The inter-branch merge-flow configuration (
github-merge-flow-release-11.jsonc), read bymerge-net11-to-release.yml, still pointed atrelease/11.0.1xx-preview4. It was never bumped to preview5.This updates
MergeToBranchtorelease/11.0.1xx-preview6(the current latest release branch) so thatnet11.0merges down into the correct preview branch.Verified
release/11.0.1xx-preview6exists on origin.