| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 739d3a3 commit 9d61da0
1 file changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -25,7 +25,7 @@ official release builds for Node.js, hosted on <https://nodejs.org/>. | |||
| 25 | 25 | * [10. Test the build](#10-test-the-build) | |
| 26 | 26 | * [11. Tag and sign the release commit](#11-tag-and-sign-the-release-commit) | |
| 27 | 27 | * [12. Set up for the next release](#12-set-up-for-the-next-release) | |
| 28 | - * [13. Cherry-pick the release commit to `master`](#13-cherry-pick-the-release-commit-to-master) | ||
| 28 | + * [13. Cherry-pick the release commit to `main`](#13-cherry-pick-the-release-commit-to-main) | ||
| 29 | 29 | * [14. Push the release tag](#14-push-the-release-tag) | |
| 30 | 30 | * [15. Promote and sign the release builds](#15-promote-and-sign-the-release-builds) | |
| 31 | 31 | * [16. Check the release](#16-check-the-release) | |
@@ -132,7 +132,7 @@ tracker][]. | |||
| 132 | 132 | ||
| 133 | 133 | When preparing a security release, contact Build at least two weekdays in | |
| 134 | 134 | advance of the expected release. To ensure that the security patch(es) can be | |
| 135 | - properly tested, run a `node-test-pull-request` job against the `master` branch | ||
| 135 | + properly tested, run a `node-test-pull-request` job against the `main` branch | ||
| 136 | 136 | of the `nodejs-private/node-private` repository a day or so before the | |
| 137 | 137 | [CI lockdown procedure][] begins. This is to confirm that Jenkins can properly | |
| 138 | 138 | access the private repository. | |
@@ -147,7 +147,7 @@ $ git checkout v1.x-staging | |||
| 147 | 147 | $ git reset --hard upstream/v1.x-staging | |
| 148 | 148 | ``` | |
| 149 | 149 | ||
| 150 | - If the staging branch is not up to date relative to `master`, bring the | ||
| 150 | + If the staging branch is not up to date relative to `main`, bring the | ||
| 151 | 151 | appropriate PRs and commits into it. | |
| 152 | 152 | ||
| 153 | 153 | 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,7 +156,7 @@ For each PR: | |||
| 156 | 156 | ||
| 157 | 157 | * Run or check that there is a passing CI. | |
| 158 | 158 | * Check approvals (you can approve yourself). | |
| 159 | - * Check that the commit metadata was not changed from the `master` commit. | ||
| 159 | + * Check that the commit metadata was not changed from the `main` commit. | ||
| 160 | 160 | * If there are merge conflicts, ask the PR author to rebase. | |
| 161 | 161 | Simple conflicts can be resolved when landing. | |
| 162 | 162 | ||
@@ -175,7 +175,7 @@ duplicate or not. | |||
| 175 | 175 | For a list of commits that could be landed in a patch release on v1.x: | |
| 176 | 176 | ||
| 177 | 177 | ```console | |
| 178 | - $ branch-diff v1.x-staging master --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=simple | ||
| 178 | + $ branch-diff v1.x-staging main --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=simple | ||
| 179 | 179 | ``` | |
| 180 | 180 | ||
| 181 | 181 | Previously released commits and version bumps do not need to be | |
@@ -195,7 +195,7 @@ command. (For semver-minor releases, make sure to remove the `semver-minor` tag | |||
| 195 | 195 | from `exclude-label`.) | |
| 196 | 196 | ||
| 197 | 197 | ```console | |
| 198 | - $ branch-diff v1.x-staging master --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=sha --reverse | xargs git cherry-pick | ||
| 198 | + $ branch-diff v1.x-staging main --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=sha --reverse | xargs git cherry-pick | ||
| 199 | 199 | ``` | |
| 200 | 200 | ||
| 201 | 201 | When cherry-picking commits, if there are simple conflicts you can resolve | |
@@ -387,7 +387,7 @@ release branches to more easily be passed between members of the release team if | |||
| 387 | 387 | necessary. | |
| 388 | 388 | ||
| 389 | 389 | Create a pull request targeting the correct release line. For example, a | |
| 390 | - `v5.3.0-proposal` PR should target `v5.x`, not master. Paste the CHANGELOG | ||
| 390 | + `v5.3.0-proposal` PR should target `v5.x`, not `main`. Paste the CHANGELOG | ||
| 391 | 391 | modifications into the body of the PR so that collaborators can see what is | |
| 392 | 392 | changing. These PRs should be left open for at least 24 hours, and can be | |
| 393 | 393 | updated as new commits land. If the CHANGELOG pasted into the pull request | |
@@ -540,10 +540,10 @@ $ git rebase v1.x | |||
| 540 | 540 | $ git push upstream v1.x-staging | |
| 541 | 541 | ``` | |
| 542 | 542 | ||
| 543 | - ### 13. Cherry-pick the release commit to `master` | ||
| 543 | + ### 13. Cherry-pick the release commit to `main` | ||
| 544 | 544 | ||
| 545 | 545 | ```console | |
| 546 | - $ git checkout master | ||
| 546 | + $ git checkout main | ||
| 547 | 547 | $ git cherry-pick v1.x^ | |
| 548 | 548 | ``` | |
| 549 | 549 | ||
@@ -565,10 +565,10 @@ Then finish cherry-picking and push the commit upstream: | |||
| 565 | 565 | $ git add src/node_version.h doc | |
| 566 | 566 | $ git cherry-pick --continue | |
| 567 | 567 | $ make lint | |
| 568 | - $ git push upstream master | ||
| 568 | + $ git push upstream main | ||
| 569 | 569 | ``` | |
| 570 | 570 | ||
| 571 | - **Do not** cherry-pick the "Working on vx.y.z" commit to `master`. | ||
| 571 | + **Do not** cherry-pick the "Working on vx.y.z" commit to `main`. | ||
| 572 | 572 | ||
| 573 | 573 | ### 14. Push the release tag | |
| 574 | 574 | ||
@@ -798,8 +798,8 @@ announced immediately following the release of 12.0.0). | |||
| 798 | 798 | ||
| 799 | 799 | Approximately two months before a major release, new `vN.x` and | |
| 800 | 800 | `vN.x-staging` branches (where `N` indicates the major release) should be | |
| 801 | - created as forks of the `master` branch. Up until one week before the release | ||
| 802 | - date, these must be kept in sync with `master`. | ||
| 801 | + created as forks of the `main` branch. Up until one week before the release | ||
| 802 | + date, these must be kept in sync with `main`. | ||
| 803 | 803 | ||
| 804 | 804 | The `vN.x` and `vN.x-staging` branches must be kept in sync with one another | |
| 805 | 805 | up until the date of the release. | |
| Back | FazBrowse Home | New Git URL |
0 commit comments