Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2dd8f09

Browse filesBrowse files
marco-ippolitotargos
authored andcommitted
doc: exclude commits with baking-for-lts
PR-URL: #52896 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ruy Adorno <ruy@vlt.sh> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
1 parent bb97e1c commit 2dd8f09
Copy full SHA for 2dd8f09

File tree

Expand file treeCollapse file tree

1 file changed

+17
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+17
-1
lines changed
Open diff view settings
Collapse file

‎doc/contributing/releases.md‎

Copy file name to clipboardExpand all lines: doc/contributing/releases.md
+17-1Lines changed: 17 additions & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ git reset --hard upstream/v1.x-staging
153153
If the staging branch is not up to date relative to `main`, bring the
154154
appropriate PRs and commits into it.
155155

156-
Go through PRs with the label `vN.x`. e.g. [PRs with the `v8.x` label](https://github.com/nodejs/node/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+label%3Av8.x).
156+
Go through PRs with the label `vN.x`. e.g. [PRs with the
157+
`v8.x` label](https://github.com/nodejs/node/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+label%3Av8.x)
158+
and `baking-for-lts` label if preparing a release for an LTS line.
157159

158160
For each PR:
159161

@@ -162,6 +164,8 @@ For each PR:
162164
* Check that the commit metadata was not changed from the `main` commit.
163165
* If there are merge conflicts, ask the PR author to rebase.
164166
Simple conflicts can be resolved when landing.
167+
* If `baking-for-lts` is present, check if the PR is ready to be landed.
168+
If it is, remove the `baking-for-lts` label.
165169

166170
When landing the PR add the `Backport-PR-URL:` line to each commit. Close the
167171
backport PR with `Landed in ...`. Update the label on the original PR from
@@ -188,6 +192,12 @@ For a list of commits that could be landed in a minor release on v1.x:
188192
N=1 sh -c 'branch-diff v$N.x-staging upstream/main --exclude-label=semver-major,dont-land-on-v$N.x,backport-requested-v$N.x,backport-blocked-v$N.x,backport-open-v$N.x,backported-to-v$N.x --filter-release --format=simple'
189193
```
190194

195+
If the target branch is an LTS line, you should also exclude the `baking-for-lts`:
196+
197+
```bash
198+
N=1 sh -c 'branch-diff v$N.x-staging upstream/main --exclude-label=semver-major,dont-land-on-v$N.x,backport-requested-v$N.x,backport-blocked-v$N.x,backport-open-v$N.x,backported-to-v$N.x,baking-for-lts --filter-release --format=simple'
199+
```
200+
191201
Previously released commits and version bumps do not need to be
192202
cherry-picked.
193203

@@ -207,6 +217,12 @@ command.
207217
N=1 sh -c 'branch-diff v$N.x-staging upstream/main --exclude-label=semver-major,dont-land-on-v$N.x,backport-requested-v$N.x,backport-blocked-v$N.x,backport-open-v$N.x,backported-to-v$N.x --filter-release --format=sha --reverse' | xargs git cherry-pick -S
208218
```
209219

220+
If the target branch is an LTS line, you should also exclude the `baking-for-lts`:
221+
222+
```bash
223+
N=1 sh -c 'branch-diff v$N.x-staging upstream/main --exclude-label=semver-major,dont-land-on-v$N.x,backport-requested-v$N.x,backport-blocked-v$N.x,backport-open-v$N.x,backported-to-v$N.x,baking-for-lts --filter-release --format=sha --reverse' | xargs git cherry-pick -S
224+
```
225+
210226
<sup>For patch releases, make sure to add the `semver-minor` tag
211227
to `exclude-label`<sup>
212228

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.