Skip to content

Commit 83c8e5c

Browse files
committedJul 24, 2017
doc: describe labelling process for backports
Based on discussion from the first backporting team meeting. PR-URL: #12431 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Myles Borins <[email protected]>
1 parent 3414e42 commit 83c8e5c

File tree

1 file changed

+27
-4
lines changed

1 file changed

+27
-4
lines changed
 

‎doc/onboarding-extras.md

+27-4
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,33 @@ Please use these when possible / appropriate
8080
git checkout $(git show -s --pretty='%T' $(git show-ref -d $(git describe --abbrev=0) | tail -n1 | awk '{print $1}')) -- test; make -j4 test
8181
```
8282

83+
### LTS/Version labels
84+
85+
We use labels to keep track of which branches a commit should land on:
86+
87+
* `dont-land-on-v?.x`
88+
* For changes that do not apply to a certain release line
89+
* Also used when the work of backporting a change outweighs the benefits
90+
* `land-on-v?.x`
91+
* Used by releasers to mark a PR as scheduled for inclusion in an LTS release
92+
* Applied to the original PR for clean cherry-picks, to the backport PR otherwise
93+
* `backport-requested-v?.x`
94+
* Used to indicate that a PR needs a manual backport to a branch in order to land the changes on that branch
95+
* Typically applied by a releaser when the PR does not apply cleanly or it breaks the tests after applying
96+
* Will be replaced by either `dont-land-on-v?.x` or `backported-to-v?.x`
97+
* `backported-to-v?.x`
98+
* Applied to PRs for which a backport PR has been merged
99+
* `lts-watch-v?.x`
100+
* Applied to PRs which the LTS working group should consider including in a LTS release
101+
* Does not indicate that any specific action will be taken, but can be effective as messaging to non-collaborators
102+
* `lts-agenda`
103+
* For things that need discussion by the LTS working group
104+
* (for example semver-minor changes that need or should go into an LTS release)
105+
* `v?.x`
106+
* Automatically applied to changes that do not target `master` but rather the `v?.x-staging` branch
107+
108+
Once a release line enters maintenance mode, the corresponding labels do not
109+
need to be attached anymore, as only important bugfixes will be included.
83110

84111
### Other Labels
85112

@@ -89,10 +116,6 @@ Please use these when possible / appropriate
89116
* Architecture labels
90117
* `arm`, `mips`, `s390`, `ppc`
91118
* No x86{_64}, since that is the implied default
92-
* `lts-agenda`, `lts-watch-v*`
93-
* tag things that should be discussed to go into LTS or should go into a specific LTS branch
94-
* (usually only semver-patch things)
95-
* will come more naturally over time
96119

97120

98121
## Updating Node.js from Upstream

0 commit comments

Comments
 (0)