Automate branch setup and add verification in backport-changes skill#7222
Open
lbussell wants to merge 9 commits into
Open
Automate branch setup and add verification in backport-changes skill#7222lbussell wants to merge 9 commits into
lbussell wants to merge 9 commits into
Conversation
Add post-cherry-pick verification (Get-BackportDiff.ps1, diffs HEAD against nightly), label cleanup (Remove-BackportLabels.ps1), expected-divergence guidance, explicit PR step, and a merge-commit guideline to the workflow. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add pr-body-template.md and document the PR title format (Backport changes from nightly to \) in the workflow. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Create the working branch as step 2 (right after determining the release branch), and move plan confirmation to the cherry-pick step. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mthalman
reviewed
Jun 5, 2026
| # than a possibly-stale local branch. | ||
| function Get-LatestPublicReleaseBranch { | ||
| $remote = Get-PublicRemoteName | ||
| git fetch $remote 2>&1 | Out-Null |
Member
Author
There was a problem hiding this comment.
Just an AI-ism... let me comb over the scripts more carefully and then I'll re-request review.
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
2 participants
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.
This PR improves the
backport-changesskill by making the process more automated.New-BackportBranch.ps1creates a working branch off the latest release branch (or a specified one), replacing the old manual steps.Get-BackportDiff.ps1diffsHEADagainstnightly, and a new "Expected divergences from nightly" section inSKILL.mdexplains how to triage the result so real missed backports stand out from expected drift.pr-body-template.md) with full-changeset confirmation, plusRemove-BackportLabels.ps1to clearneeds-backportfrom handled PRs.Get-RemoteNameinto a newshared/GitHelpers.ps1and added helpers for resolving the public remote and latest release branch.eng/commontoeng/docker-tools.