Add merge flow: net11.0 → next release branch#34626
Merged
Conversation
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 34626Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 34626" |
Contributor
There was a problem hiding this comment.
Pull request overview
Adds an automated inter-branch merge flow so changes from net11.0 can be regularly merged into release/11.0.1xx-preview3 using the shared dotnet/arcade merge infrastructure.
Changes:
- Add an Arcade merge-flow configuration mapping
net11.0→release/11.0.1xx-preview3. - Add a GitHub Actions workflow that triggers on
net11.0pushes, a daily cron, and manual dispatch to run the merge flow.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
github-merge-flow-release-11.jsonc |
Defines merge-flow configuration for merging net11.0 into release/11.0.1xx-preview3, including ResetToTargetPaths and QuietComments. |
.github/workflows/merge-net11-to-release.yml |
Adds the scheduled/event-driven workflow that runs Arcade’s inter-branch-merge-base.yml using the new config file. |
Comment on lines
+13
to
+14
| # 1. github-merge-flow-release-11.jsonc → MergeToBranch | ||
| # 2. This file → push branches trigger |
There was a problem hiding this comment.
The maintenance note says to update “This file → push branches trigger” when cutting a new release, but the push trigger should stay on net11.0; what actually needs updating is the workflow name (and potentially the config file path/branch target). Please adjust this comment to avoid misleading future maintainers.
Suggested change
| # 1. github-merge-flow-release-11.jsonc → MergeToBranch | |
| # 2. This file → push branches trigger | |
| # 1. github-merge-flow-release-11.jsonc → MergeToBranch (and any target branch-specific settings) | |
| # 2. This file → workflow `name` (and configuration_file_path/targets if they change) |
PureWeen
force-pushed
the
feature/merge-flow-release-11
branch
from
fb3f29a to
c37c501
Compare
Adds arcade inter-branch merge workflow for net11.0 → release branch. Target branch configured in github-merge-flow-release-11.jsonc. Update MergeToBranch value when cutting a new release. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
PureWeen
force-pushed
the
feature/merge-flow-release-11
branch
from
c37c501 to
70ed57b
Compare
PureWeen
changed the title
jonathanpeppers
approved these changes
Mar 24, 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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Adds arcade inter-branch merge workflow and configuration to automate merging
net11.0into therelease/11.0.1xx-preview3branch.Files added
github-merge-flow-release-11.jsoncnet11.0, targetrelease/11.0.1xx-preview3.github/workflows/merge-net11-to-release.ymlHow it works
Uses the shared dotnet/arcade inter-branch merge infrastructure:
net11.0, with daily cron safety netglobal.json,NuGet.config,eng/Version.Details.xml,eng/Versions.props,eng/common/*to target branch versionsIncrementing for future releases
When cutting a new release (e.g., preview4), update:
github-merge-flow-release-11.jsonc→ changeMergeToBranchvalue.github/workflows/merge-net11-to-release.yml→ update workflownamefieldFollows the same pattern as
merge-main-to-net11.yml/github-merge-flow-net11.jsonc.