Skip to content

Commit 5f242eb

Browse files
authored
doc: note linear history rule on branch-off
Pushing new `vN.x` and `vN.x-staging` branches to the repository is rejected by the "Require linear history" ruleset, because branch creation evaluates the whole history and `main` still contains merge commits from 2015. Document that a repository admin must disable the rule, push the branches, and enable it again, as done for v26.x and v27.x. Refs: nodejs/Release#1187 Signed-off-by: RafaelGSS <rafael.nunu@hotmail.com> PR-URL: #67057 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Richard Lau <richard.lau@ibm.com> Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent e3b3984 commit 5f242eb

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

‎doc/contributing/releases.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,6 +1420,17 @@ created as forks of the `main` branch. Alpha releases should be released picking
14201420
up commits from `main`. Target the first alpha release to be released the same
14211421
day as the previous release line is graduated to LTS status.
14221422

1423+
Pushing the new branches is rejected by the [Require linear history][]
1424+
repository rule, because creating a branch evaluates its whole history and
1425+
`main` contains merge commits from 2015. A repository admin must disable the
1426+
rule, push the branches, and enable it again:
1427+
1428+
```bash
1429+
gh api -X PUT repos/nodejs/node/rulesets/714811 -f enforcement=disabled
1430+
git push upstream main:refs/heads/vN.x main:refs/heads/vN.x-staging
1431+
gh api -X PUT repos/nodejs/node/rulesets/714811 -f enforcement=active
1432+
```
1433+
14231434
If a `SEMVER-MAJOR` pull request lands on the default branch within one month
14241435
prior to the major release date, it must not be included on the new major
14251436
staging branch, unless there is consensus from the Node.js releasers team to
@@ -1708,6 +1719,7 @@ Typical resolution: sign the release again.
17081719
[Build issue tracker]: https://github.com/nodejs/build/issues/new
17091720
[Node.js Snap management repository]: https://github.com/nodejs/snap
17101721
[Release repository]: https://github.com/nodejs/Release
1722+
[Require linear history]: https://github.com/nodejs/node/rules/714811
17111723
[Semantic Versioning]: https://semver.org/
17121724
[Snap]: https://snapcraft.io/node
17131725
[`create-release-post.yml`]: https://github.com/nodejs/nodejs.org/actions/workflows/create-release-post.yml

0 commit comments

Comments
 (0)