Commit 2dd8f09
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
1 file changed
Lines changed: 17 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -153,7 +153,9 @@ git reset --hard upstream/v1.x-staging | |||
| 153 | 153 | If the staging branch is not up to date relative to `main`, bring the | |
| 154 | 154 | appropriate PRs and commits into it. | |
| 155 | 155 | ||
| 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. | ||
| 157 | 159 | ||
| 158 | 160 | For each PR: | |
| 159 | 161 | ||
@@ -162,6 +164,8 @@ For each PR: | |||
| 162 | 164 | * Check that the commit metadata was not changed from the `main` commit. | |
| 163 | 165 | * If there are merge conflicts, ask the PR author to rebase. | |
| 164 | 166 | 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. | ||
| 165 | 169 | ||
| 166 | 170 | When landing the PR add the `Backport-PR-URL:` line to each commit. Close the | |
| 167 | 171 | 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: | |||
| 188 | 192 | 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' | |
| 189 | 193 | ``` | |
| 190 | 194 | ||
| 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 | + | ||
| 191 | 201 | Previously released commits and version bumps do not need to be | |
| 192 | 202 | cherry-picked. | |
| 193 | 203 | ||
@@ -207,6 +217,12 @@ command. | |||
| 207 | 217 | 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 | |
| 208 | 218 | ``` | |
| 209 | 219 | ||
| 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 | + | ||
| 210 | 226 | <sup>For patch releases, make sure to add the `semver-minor` tag | |
| 211 | 227 | to `exclude-label`<sup> | |
| 212 | 228 | ||
0 commit comments