Skip to content

Commit 3be7a7a

Browse files
evanlucasMylesBorins
authored andcommitted
doc: update LTS info for current releases
The COLLABORATOR_GUIDE was still listing v0.10 and v0.12 as LTS when they are EOL now. PR-URL: #10720 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 530adfd commit 3be7a7a

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

COLLABORATOR_GUIDE.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,8 @@ CTC for further discussion.
281281

282282
#### How are LTS Branches Managed?
283283

284-
There are currently three LTS branches: `v4.x`, `v0.10`, and `v0.12`. Each
285-
of these is paired with a "staging" branch: `v4.x-staging`, `v0.10-staging`,
286-
and `v0.12-staging`.
284+
There are currently two LTS branches: `v6.x` and `v4.x`. Each of these is paired
285+
with a "staging" branch: `v6.x-staging` and `v4.x-staging`.
287286

288287
As commits land in `master`, they are cherry-picked back to each staging
289288
branch as appropriate. If the commit applies only to the LTS branch, the
@@ -304,18 +303,14 @@ please feel free to include that information in the PR thread.
304303

305304
Several LTS related issue and PR labels have been provided:
306305

306+
* `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be considered
307+
for landing in the `v6.x-staging` branch.
307308
* `lts-watch-v4.x` - tells the LTS WG that the issue/PR needs to be considered
308309
for landing in the `v4.x-staging` branch.
309-
* `lts-watch-v0.10` - tells the LTS WG that the issue/PR needs to be considered
310-
for landing in the `v0.10-staging` branch.
311-
* `lts-watch-v0.12` - tells the LTS WG that the issue/PR needs to be considered
312-
for landing in the `v0.12-staging` branch.
310+
* `land-on-v6.x` - tells the release team that the commit should be landed
311+
in a future v6.x release
313312
* `land-on-v4.x` - tells the release team that the commit should be landed
314313
in a future v4.x release
315-
* `land-on-v0.10` - tells the release team that the commit should be landed
316-
in a future v0.10 release
317-
* `land-on-v0.12` - tells the release team that the commit should be landed
318-
in a future v0.12 release
319314

320315
Any collaborator can attach these labels to any PR/issue. As commits are
321316
landed into the staging branches, the `lts-watch-` label will be removed.

0 commit comments

Comments
 (0)