Skip to content

Add release branch calculation to backport-changes skill #7180

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.

Sign up for GitHub

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

Merged
lbussell merged 1 commit into from
May 11, 2026
Merged

Add release branch calculation to backport-changes skill #7180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/skills/backport-changes/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ disable-model-invocation: true

## Workflow

1. **Get candidates for backport**: Run `pwsh scripts/Get-BackportPRs.ps1` to find PRs to backport.
2. **Analyze PRs** - classify each PR using the backport guidelines below and present the analysis table to the user
3. **Cherry-pick** - confirm the plan with the user, then run `git cherry-pick <commits>` (in the order they were merged).
1. **Determine the release branch**: Run `pwsh ../shared/Get-ReleaseBranches.ps1` to find the latest public release branch.
- The most recently created public release branch corresponds to the current release.
- Do not assume `main` is the release branch.
2. **Get candidates for backport**: Run `pwsh scripts/Get-BackportPRs.ps1` to find PRs to backport.
3. **Analyze PRs** - classify each PR using the backport guidelines below and present the analysis table to the user
4. **Cherry-pick** - confirm the plan with the user, create a working branch based off of the public release branch, then run `git cherry-pick <commits>` (in the order they were merged).
- If any templates or manifests changed, regenerate Dockerfiles and READMEs. Confirm that the diff looks correct.
4. **Resolve conflicts** - follow the conflict resolution table below; stop and consult the user for anything not covered
5. **Resolve conflicts** - follow the conflict resolution table below; stop and consult the user for anything not covered

## Backport guidelines

Expand Down
Loading