Skip to content

Commit 789bafd

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 fef9785 commit 789bafd

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

COLLABORATOR_GUIDE.md

+6-11
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,8 @@ CTC for further discussion.
319319

320320
#### How are LTS Branches Managed?
321321

322-
There are currently three LTS branches: `v4.x`, `v0.10`, and `v0.12`. Each
323-
of these is paired with a "staging" branch: `v4.x-staging`, `v0.10-staging`,
324-
and `v0.12-staging`.
322+
There are currently two LTS branches: `v6.x` and `v4.x`. Each of these is paired
323+
with a "staging" branch: `v6.x-staging` and `v4.x-staging`.
325324

326325
As commits land in `master`, they are cherry-picked back to each staging
327326
branch as appropriate. If the commit applies only to the LTS branch, the
@@ -342,18 +341,14 @@ please feel free to include that information in the PR thread.
342341

343342
Several LTS related issue and PR labels have been provided:
344343

344+
* `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be considered
345+
for landing in the `v6.x-staging` branch.
345346
* `lts-watch-v4.x` - tells the LTS WG that the issue/PR needs to be considered
346347
for landing in the `v4.x-staging` branch.
347-
* `lts-watch-v0.10` - tells the LTS WG that the issue/PR needs to be considered
348-
for landing in the `v0.10-staging` branch.
349-
* `lts-watch-v0.12` - tells the LTS WG that the issue/PR needs to be considered
350-
for landing in the `v0.12-staging` branch.
348+
* `land-on-v6.x` - tells the release team that the commit should be landed
349+
in a future v6.x release
351350
* `land-on-v4.x` - tells the release team that the commit should be landed
352351
in a future v4.x release
353-
* `land-on-v0.10` - tells the release team that the commit should be landed
354-
in a future v0.10 release
355-
* `land-on-v0.12` - tells the release team that the commit should be landed
356-
in a future v0.12 release
357352

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

0 commit comments

Comments
 (0)