Skip to content

Commit 0bc267f

Browse files
authored
Add release branch calculation to backport-changes skill (dotnet#7180)
1 parent f5e32b0 commit 0bc267f

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

.github/skills/backport-changes/SKILL.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ disable-model-invocation: true
99

1010
## Workflow
1111

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

1821
## Backport guidelines
1922

0 commit comments

Comments
 (0)