Skip to content

Commit f95669e

Browse files
committed
Move the milestoning step to be done while making the beta rollup.
1 parent b7aa227 commit f95669e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/release/backporting.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,20 @@ Getting a PR backported to the beta branch involves the following process:
2727
4. Open a PR **against the beta branch** with a title that starts with `[beta]` (so reviewers can see its specialness).
2828
5. List all of the PRs being backported in the PR description.
2929
[Here's an example](https://github.com/rust-lang/rust/pull/64097).
30+
6. Go through all of the PRs being backported and:
31+
32+
* Change the milestone to the correct value for the beta release.
33+
* Remove the `beta-nominated` label.
34+
This indicates that the backport has been completed.
35+
36+
If there are a lot of PRs, this can be done quickly by opening the [nominated + accepted][nominated-plus-accepted] query, check all the PRs being backported, and use the "Milestones" and "Label" drop-downs to modify multiple PRs in bulk.
37+
38+
This last step can be done before or after the beta PR has been merged, though it can be easy to forget if you wait for it to be merged.
3039

3140
4. A reviewer (typically from the release team) needs to verify that the backport looks correct and that it's submitted to the beta branch.
3241
They will then approve with `@bors r+ rollup=never` (to avoid it being rolled up on accident).
3342
If the author of the PR has r+ rights, and has not made significant changes while backporting, they can also self-approve the PR.
3443

35-
5. Go through all of the PRs being backported and:
36-
37-
* Change the milestone to the correct value for the beta release.
38-
* Remove the `beta-nominated` label.
39-
This indicates that the backport has been completed.
40-
41-
If there are a lot of PRs, this can be done quickly by opening the [nominated + accepted][nominated-plus-accepted] query, check all the PRs being backported, and use the "Milestones" and "Label" drop-downs to modify multiple PRs in bulk.
4244

4345
In summary, there are three states that a PR can go through:
4446
1. `beta-nominated`: Needs the team's attention.

0 commit comments

Comments
 (0)