doc: clarify who may land on an LTS staging branch #24465
Conversation
Current language is a bit confusing
|
@MylesBorins sadly an error occured when I tried to trigger a build :( |
|
This paragraph is part of "How are LTS Branches Managed?" so it doesn't really make sense to have a rule about non-LTS branches in it IMHO. |
|
@targos I'm trying to figure out the intention of the original language as compared to what is documented in https://github.com/nodejs/release#lts-staging-branches Perhaps it is better to just point at the Release repo as the source of truth? |
|
I read the same semantics in https://github.com/nodejs/release#lts-staging-branches
|
|
@refack independent of the specific reading of the text this is how the LTS team has operated... otherwise there would be no need or an @nodejs/backporters team. The only reason the branches are not protected are because they can't be force pushed If we want to make the policy more lenient that is fine, but a different conversation. If the current way the policy is documented is confusing, we should fix that. There have been more than one occasion where collaborators have accidentally backported stuff to the staging branch and it has been pointed out and not an issue. This is the first time it became clear that the documentation was inconsistent, or could be read as inconsistent, with how we actually do the work. |
There was a problem hiding this comment.
LGTM in that this clearly documents our current practice and is more clear (I think) than the current text. Whether that practice could or should be changed, or whether the documentation could or should happen elsewhere rather than in this particular paragraph...
¯\(ツ)/¯
Co-Authored-By: MylesBorins <myles.borins@gmail.com>
|
Then can this also mention the backporters team for LTS staging? I didn't know it's purpose until now |
|
I've further clarified the language PTAL |
IMO https://github.com/nodejs/release#lts-staging-branches has the same issue as the collaborator guide before the changes in this PR:
So having defined "release branch" and "staging branch" the only documented restriction is on the "release branch" -- If both branches are to be restricted then why specify "release branch" in the third sentence? |
|
can we fast track this? @richardlau nodejs/Release#387 should fix the inconsistency in the Relase repo and I've opened nodejs/Release#388 to discuss changing the policy |
COLLABORATOR_GUIDE.md
Outdated
| team should land commits into the LTS branch while preparing a new | ||
| LTS release. | ||
| Only the members of the @nodejs/backporters team should land commits into the | ||
| LTS staging branch. |
There was a problem hiding this comment.
LGTM as documenting current practice
|
Landed in e9545e6. |
Current language is a bit confusing PR-URL: #24465 Refs: #24344 (comment) Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Current language is a bit confusing PR-URL: #24465 Refs: #24344 (comment) Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Current language is a bit confusing PR-URL: #24465 Refs: #24344 (comment) Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Current language is a bit confusing PR-URL: #24465 Refs: #24344 (comment) Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Current language is a bit confusing PR-URL: nodejs#24465 Refs: nodejs#24344 (comment) Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Current language is a bit confusing PR-URL: #24465 Refs: #24344 (comment) Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Current language is a bit confusing PR-URL: #24465 Refs: #24344 (comment) Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Current language is a bit confusing
Refs: #24344 (comment)