-
Notifications
You must be signed in to change notification settings - Fork 166
Document staging branch workflow for Ask Mode releases #2762
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Explain the concept of staging branches during Ask Mode and document when/why branchToUpdateSubmodule differs from branchToMirror in the mirror pipeline configuration. Co-authored-by: mattkur <13772048+mattkur@users.noreply.github.com>
| This staged approach provides maintainers with greater control during the | ||
| critical Ask Mode phase, allowing them to: | ||
|
|
||
| * **Test changes in isolation** before they reach the release branch | ||
| * **Batch multiple fixes** together for comprehensive validation | ||
| * **Roll back problematic changes** from staging without affecting the release | ||
| branch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This stuff isn't required.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed in 38e5c4d
| * **`branchToMirror`**: Points to the official release branch (e.g., | ||
| `release/1.7.2511`) | ||
| * **`branchToUpdateSubmodule`**: Points to the staging branch (e.g., | ||
| `staging/1.7.2511`) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@benhillis , is this right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's move this above ## Marking, Approval Process, Code Flow
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved in 38e5c4d
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want devs to say "Clean cherry pick of #mypr" in the PR description. Update here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated in 38e5c4d to include "Clean cherry-pick of #<PR_NUMBER>" guidance
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, let's also update this line: the next release will require supporting updates from 2411, 2505, and 1.7.2511.
Let's also create a placeholder, called release/1.8., where development happens in main.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated in 38e5c4d - added release/1.8 placeholder and updated servicing notes to include 1.7.2511
… move release table, add release/1.8 - Remove the bullet list explaining staging branch benefits (not required) - Add guidance to include "Clean cherry-pick of #<PR_NUMBER>" for clean cherry-picks - Move "Existing Release Branches" section above "Marking, Approval Process, Code Flow" - Add release/1.8 as Stabilization phase - Update next release notes to include servicing from 1.7.2511 Co-authored-by: mattkur <13772048+mattkur@users.noreply.github.com>
| | release/2411 | Out of service | | | ||
| | release/2505 | Servicing | Supports runtime servicing from release/2411. | | ||
| | release/1.7.2511 | Ask Mode | Supports runtime servicing from release/2411 and release/2505. | | ||
| | release/1.8 | Stabilization | Supports runtime servicing from release/2411, release/2505, and release/1.7.2511. | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, call it release/1.8.xxyy and say we are in Active Development
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated in d287a16 - changed to release/1.8.xxyy with Active Development phase
Changed release/1.8 to release/1.8.xxyy and updated its phase from Stabilization to Active Development per feedback. Co-authored-by: mattkur <13772048+mattkur@users.noreply.github.com>
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.