diff --git a/components/git/backport.js b/components/git/backport.js index 60f67cb..0add653 100644 --- a/components/git/backport.js +++ b/components/git/backport.js @@ -10,12 +10,12 @@ const epilogue = `====================== Example ======================= Demo: https://asciinema.org/a/221244 Backporting https://github.com/nodejs/node/pull/24816 to v11.x -# Sync master with upstream for the commits, if they are not yet there -$ git checkout master -$ ncu-config set branch master +# Sync main with upstream for the commits, if they are not yet there +$ git checkout main +$ ncu-config set branch main $ git node sync -# Backport existing commits from master to v11.x-staging +# Backport existing commits from main to v11.x-staging $ git checkout v11.x-staging $ ncu-config set branch v11.x-staging $ git node sync diff --git a/components/git/epilogue.js b/components/git/epilogue.js index 2482a02..077e3cf 100644 --- a/components/git/epilogue.js +++ b/components/git/epilogue.js @@ -4,9 +4,9 @@ $ cd path/to/node/project # If you have not configured it before $ ncu-config set upstream -$ ncu-config set branch master # Assuming you are landing commits on master +$ ncu-config set branch main # Assuming you are landing commits on main -$ git checkout master +$ git checkout main $ git node land --abort # Abort a landing session, just in case $ git node land $PRID # Start a new landing session $ git node land $URL # Start a new landing session using the PR URL diff --git a/docs/git-node.md b/docs/git-node.md index 55a6074..c8e4d5f 100644 --- a/docs/git-node.md +++ b/docs/git-node.md @@ -3,28 +3,29 @@ A custom Git command for managing pull requests. You can run it as `git-node` or `git node`. To see the help text, run `git node`. -- [`git node land`](#git-node-land) - - [Prerequisites](#git-node-land-prerequisites) - - [Git bash for Windows](#git-bash-for-windows) - - [Demo & Usage](#demo--usage) - - [Optional Settings](#git-node-land-optional-settings) -- [`git node backport`](#git-node-backport) - - [Example](#example) -- [`git node release`](#git-node-release) - - [Example](#example-1) -- [`git node sync`](#git-node-sync) -- [`git node metadata`](#git-node-metadata) - - [Optional Settings](#git-node-metadata-optional-settings) -- [`git node v8`](#git-node-v8) - - [Prerequisites](#git-node-v8-prerequisites) - - [`git node v8 major`](#git-node-v8-major) - - [`git node v8 minor`](#git-node-v8-minor) - - [`git node v8 backport `](#git-node-v8-backport-sha) - - [General options](#general-options) -- [`git node status`](#git-node-status) - - [Example](#example) -- [`git node wpt`](#git-node-wpt) - - [Example](#example-2) +- [git-node](#git-node) + - [`git node land`](#git-node-land) + - [Prerequisites](#prerequisites) + - [Git bash for Windows](#git-bash-for-windows) + - [Demo & Usage](#demo--usage) + - [Optional Settings](#optional-settings) + - [`git node backport`](#git-node-backport) + - [Example](#example) + - [`git node release`](#git-node-release) + - [Example](#example-1) + - [`git node sync`](#git-node-sync) + - [`git node metadata`](#git-node-metadata) + - [Optional Settings](#optional-settings-1) + - [`git node v8`](#git-node-v8) + - [Prerequisites](#prerequisites-1) + - [`git node v8 major`](#git-node-v8-major) + - [`git node v8 minor`](#git-node-v8-minor) + - [`git node v8 backport `](#git-node-v8-backport-sha) + - [General options](#general-options) + - [`git node status`](#git-node-status) + - [Example](#example-2) + - [`git node wpt`](#git-node-wpt) + - [Example](#example-3) ## `git node land` @@ -93,8 +94,8 @@ Examples: # Tell ncu that your upstream remote is named "upstream" $ ncu-config set upstream upstream - # Tell ncu that you are landing patches to "master" branch - $ ncu-config set branch master + # Tell ncu that you are landing patches to "main" branch + $ ncu-config set branch main ``` Note: If you are behind a firewall and run into `ECONNREFUSED` issues with @@ -130,9 +131,9 @@ $ cd path/to/node/project # If you have not configured it before $ ncu-config set upstream -$ ncu-config set branch master # Assuming you are landing commits on master +$ ncu-config set branch main # Assuming you are landing commits on main -$ git checkout master +$ git checkout main $ git node land --abort # Abort a landing session, just in case $ git node land $PRID # Start a new landing session $ git node land $URL # Start a new landing session using the PR URL @@ -192,11 +193,11 @@ Options: ``` Backporting https://github.com/nodejs/node/pull/12344 to v10.x -# Sync master with upstream for the commits, if they are not yet there -$ git checkout master +# Sync main with upstream for the commits, if they are not yet there +$ git checkout main $ git node sync -# Backport existing commits from master to v10.x-staging +# Backport existing commits from main to v10.x-staging $ git checkout v10.x-staging $ git node sync $ git node backport 12344 --to 10 @@ -397,14 +398,14 @@ Return status and information about the current git-node land session. Shows the ### Example ```sh -node on git:master ❯ git node status 11:32AM +node on git:main ❯ git node status 11:32AM ✔ Landing session in progress -------------------------------------------------------------------------------- PR: https:/github.com/nodejs/node/pull/34800 State: AMENDING Username: codebytere Upstream: upstream -Branch: master +Branch: main ``` ## `git node wpt` @@ -441,4 +442,4 @@ $ git node wpt url # Will update test/fixtures/wpt/url and related files $ git node wpt url --commit=43feb7f612fe9160639e09a47933a29834904d69 ``` -[node.js abi version registry]: https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json +[node.js abi version registry]: https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json diff --git a/docs/ncu-ci.md b/docs/ncu-ci.md index 423a7b4..85aa105 100644 --- a/docs/ncu-ci.md +++ b/docs/ncu-ci.md @@ -42,7 +42,7 @@ Options: Examples: ```sh -node on git:master ❯ ncu-ci rate pr +node on git:main ❯ ncu-ci rate pr -------------------------------------------------------------------------------- [1/1] Running health -------------------------------------------------------------------------------- @@ -53,7 +53,7 @@ node on git:master ❯ ncu-ci rate pr ``` ```sh -node on git:master ❯ ncu-ci rate commit +node on git:main ❯ ncu-ci rate commit -------------------------------------------------------------------------------- [1/1] Running health -------------------------------------------------------------------------------- @@ -69,7 +69,7 @@ node on git:master ❯ ncu-ci rate commit Example: ```sh -node on git:master ❯ ncu-ci walk commit +node on git:main ❯ ncu-ci walk commit ✔ Done-------------------------------------------------------------------------------- [1/60] Running health -------------------------------------------------------------------------------- @@ -133,7 +133,7 @@ For example, if you would like to see the results of `node-test-pull-request` fo Example: ```sh -node on git:master ❯ ncu-ci pr 32158 +node on git:main ❯ ncu-ci pr 32158 -------------------------------------------------------------------------------- [1/1] Running PR: 32158 -------------------------------------------------------------------------------- @@ -157,7 +157,7 @@ For example, if you would like to see the results of `node-test-commit` for http Example: ```sh -node on git:master ❯ ncu-ci commit 39377 +node on git:main ❯ ncu-ci commit 39377 -------------------------------------------------------------------------------- [1/1] Running COMMIT: 39377 -------------------------------------------------------------------------------- @@ -180,7 +180,7 @@ Unstable https://ci.nodejs.org/job/node-test-commit-arm-fanned/15148/ Example: ```sh -node on git:master ❯ ncu-ci url https://github.com/nodejs/node/pull/34127 +node on git:main ❯ ncu-ci url https://github.com/nodejs/node/pull/34127 -------------------------------------------------------------------------------- [1/1] Running PR: 32158 -------------------------------------------------------------------------------- @@ -202,7 +202,7 @@ Unstable https://ci.nodejs.org/job/node-test-commit-arm-fanned/15155/ Example: ```sh -node on git:master ❯ ncu-ci benchmark 636 +node on git:main ❯ ncu-ci benchmark 636 -------------------------------------------------------------------------------- [1/1] Running BENCHMARK: 636 -------------------------------------------------------------------------------- @@ -237,7 +237,7 @@ Finished: SUCCESS Example: ``` -node on git:master ❯ ncu-ci citgm 2400 +node on git:main ❯ ncu-ci citgm 2400 -------------------------------------------------------------------------------- [1/1] Running CITGM: 2400 -------------------------------------------------------------------------------- @@ -316,7 +316,7 @@ FAILURE: 5 failures in 2390 not present in 2392 `ncu-ci daily` show recent results of `node-daily-master`. You can also aggregate the results by passing `--cache`, or limit the maximum number of CIs jobs to get data from with `--limit=N`. See `ncu-ci daily --help` for more. ```sh -node on git:master ❯ ncu-ci daily +node on git:main ❯ ncu-ci daily ✔ Done-------------------------------------------------------------------------------- [1/16] Running health -------------------------------------------------------------------------------- @@ -333,7 +333,7 @@ node on git:master ❯ ncu-ci daily ----------------------------------- Summary ------------------------------------ Result FAILURE URL https://ci.nodejs.org/job/node-test-commit/39692/ -Source https://api.github.com/repos/nodejs/node/git/refs/heads/master +Source https://api.github.com/repos/nodejs/node/git/refs/heads/main Commit [bf0d82c10247] test: remove common.localhostIPv6 Date 2020-07-16 16:57:30 -0700 Author Rich Trott diff --git a/lib/backport_session.js b/lib/backport_session.js index 3a871cc..f45a86f 100644 --- a/lib/backport_session.js +++ b/lib/backport_session.js @@ -141,9 +141,9 @@ export default class BackportSession extends Session { // TODO(joyeechuneg): add more warnings const { prid } = this; const url = getPrURL(this); - cli.log(`Looking for commits of ${url} on master...`); + cli.log(`Looking for commits of ${url} on main...`); - const commits = this.getCommitsFromBranch(prid, 'master'); + const commits = this.getCommitsFromBranch(prid, 'main'); if (commits.length === 0) { cli.error('Could not find any commit matching the PR'); diff --git a/lib/collaborators.js b/lib/collaborators.js index 2bb25f0..4ff93d0 100644 --- a/lib/collaborators.js +++ b/lib/collaborators.js @@ -68,7 +68,7 @@ export async function getCollaborators(cli, request, argv) { function parseCollaborators(readme, cli) { // This is more or less taken from - // https://github.com/rvagg/archived-iojs-tools/blob/master/pr-metadata/pr-metadata.js + // https://github.com/rvagg/archived-iojs-tools/blob/main/pr-metadata/pr-metadata.js const collaborators = new Map(); let m; diff --git a/lib/prepare_release.js b/lib/prepare_release.js index fc918fc..750eab2 100644 --- a/lib/prepare_release.js +++ b/lib/prepare_release.js @@ -587,7 +587,7 @@ export default class ReleasePreparation { 'baking-for-lts' ]; - let comparisonBranch = 'master'; + let comparisonBranch = 'main'; const isSemverMinor = versionComponents.patch === 0; if (isLTS) { // Assume Current branch matches tag with highest semver value. diff --git a/lib/session.js b/lib/session.js index 9200930..18256c5 100644 --- a/lib/session.js +++ b/lib/session.js @@ -369,8 +369,8 @@ export default class Session { cli.separator(); cli.info( 'For example, if your want to land commits on the ' + - '`master` branch, you can run:\n\n' + - ' $ ncu-config set branch master'); + '`main` branch, you can run:\n\n' + + ' $ ncu-config set branch main'); cli.separator(); cli.setExitCode(1); } diff --git a/test/fixtures/closed_pr.json b/test/fixtures/closed_pr.json index 518c520..0b7858a 100644 --- a/test/fixtures/closed_pr.json +++ b/test/fixtures/closed_pr.json @@ -17,7 +17,7 @@ ] }, "title": "testing: do not merge", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "awesome-changes", "closed": true, "closedAt": "2017-10-28T11:13:43Z", diff --git a/test/fixtures/code_and_learn_pr.json b/test/fixtures/code_and_learn_pr.json index 31ed64f..da26e2f 100644 --- a/test/fixtures/code_and_learn_pr.json +++ b/test/fixtures/code_and_learn_pr.json @@ -18,6 +18,6 @@ ] }, "title": "test: awesome changes", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "awesome-changes" } diff --git a/test/fixtures/conflicting_pr.json b/test/fixtures/conflicting_pr.json index a9cc9c8..a55a818 100644 --- a/test/fixtures/conflicting_pr.json +++ b/test/fixtures/conflicting_pr.json @@ -15,7 +15,7 @@ ] }, "title": "test: This PR has conflicts", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "pr-conflicts", "mergeable": "CONFLICTING" } diff --git a/test/fixtures/empty_profile_pr.json b/test/fixtures/empty_profile_pr.json index 51e0598..4eca1d2 100644 --- a/test/fixtures/empty_profile_pr.json +++ b/test/fixtures/empty_profile_pr.json @@ -17,6 +17,6 @@ ] }, "title": "doc: fix mdn links", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "fix-links" } diff --git a/test/fixtures/first_timer_pr.json b/test/fixtures/first_timer_pr.json index 8e57b7c..0ae29b6 100644 --- a/test/fixtures/first_timer_pr.json +++ b/test/fixtures/first_timer_pr.json @@ -23,6 +23,6 @@ ] }, "title": "test: awesome changes", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "awesome-changes" } diff --git a/test/fixtures/first_timer_pr_with_private_email.json b/test/fixtures/first_timer_pr_with_private_email.json index a3cd5fc..65a61a7 100644 --- a/test/fixtures/first_timer_pr_with_private_email.json +++ b/test/fixtures/first_timer_pr_with_private_email.json @@ -20,6 +20,6 @@ ] }, "title": "test: awesome changes", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "awesome-changes" } diff --git a/test/fixtures/jenkins/benchmark-buffer/benchmark-node-micro-benchmarks-150.txt b/test/fixtures/jenkins/benchmark-buffer/benchmark-node-micro-benchmarks-150.txt index ded72cd..4cb3b45 100644 --- a/test/fixtures/jenkins/benchmark-buffer/benchmark-node-micro-benchmarks-150.txt +++ b/test/fixtures/jenkins/benchmark-buffer/benchmark-node-micro-benchmarks-150.txt @@ -15,8 +15,8 @@ RUNS not set (ok) MACHINE_THREADS not set (ok), default is: 88 Cloning into 'node'... Checking out files: 42% (11166/26057) Checking out files: 43% (11205/26057) Checking out files: 44% (11466/26057) Checking out files: 45% (11726/26057) Checking out files: 46% (11987/26057) Checking out files: 47% (12247/26057) Checking out files: 48% (12508/26057) Checking out files: 49% (12768/26057) Checking out files: 50% (13029/26057) Checking out files: 51% (13290/26057) Checking out files: 52% (13550/26057) Checking out files: 53% (13811/26057) Checking out files: 54% (14071/26057) Checking out files: 55% (14332/26057) Checking out files: 56% (14592/26057) Checking out files: 57% (14853/26057) Checking out files: 58% (15114/26057) Checking out files: 59% (15374/26057) Checking out files: 60% (15635/26057) Checking out files: 61% (15895/26057) Checking out files: 62% (16156/26057) Checking out files: 63% (16416/26057) Checking out files: 64% (16677/26057) Checking out files: 65% (16938/26057) Checking out files: 66% (17198/26057) Checking out files: 67% (17459/26057) Checking out files: 68% (17719/26057) Checking out files: 69% (17980/26057) Checking out files: 70% (18240/26057) Checking out files: 71% (18501/26057) Checking out files: 72% (18762/26057) Checking out files: 73% (19022/26057) Checking out files: 74% (19283/26057) Checking out files: 75% (19543/26057) Checking out files: 76% (19804/26057) Checking out files: 77% (20064/26057) Checking out files: 78% (20325/26057) Checking out files: 79% (20586/26057) Checking out files: 80% (20846/26057) Checking out files: 81% (21107/26057) Checking out files: 82% (21367/26057) Checking out files: 83% (21628/26057) Checking out files: 84% (21888/26057) Checking out files: 85% (22149/26057) Checking out files: 86% (22410/26057) Checking out files: 87% (22670/26057) Checking out files: 88% (22931/26057) Checking out files: 89% (23191/26057) Checking out files: 90% (23452/26057) Checking out files: 91% (23712/26057) Checking out files: 92% (23973/26057) Checking out files: 93% (24234/26057) Checking out files: 94% (24494/26057) Checking out files: 95% (24755/26057) Checking out files: 96% (25015/26057) Checking out files: 97% (25276/26057) Checking out files: 98% (25536/26057) Checking out files: 99% (25797/26057) Checking out files: 100% (26057/26057) Checking out files: 100% (26057/26057), done. -Already on 'master' -Your branch is up-to-date with 'origin/master'. +Already on 'main' +Your branch is up-to-date with 'origin/main'. ../deps/icu-small/source/i18n/olsontz.cpp: In member function ‘virtual UBool icu_60::OlsonTimeZone::inDaylightTime(UDate, UErrorCode&) const’: ../deps/icu-small/source/i18n/olsontz.cpp:604:18: warning: ‘dst’ may be used uninitialized in this function [-Wmaybe-uninitialized] int32_t raw, dst; diff --git a/test/fixtures/jenkins/git-failure-1/node-test-commit-19225.json b/test/fixtures/jenkins/git-failure-1/node-test-commit-19225.json index 652f4db..68cff33 100644 --- a/test/fixtures/jenkins/git-failure-1/node-test-commit-19225.json +++ b/test/fixtures/jenkins/git-failure-1/node-test-commit-19225.json @@ -28,7 +28,7 @@ { "_class": "hudson.model.StringParameterValue", "name": "REBASE_ONTO", - "value": "origin/master" + "value": "origin/main" }, { "_class": "hudson.model.StringParameterValue", diff --git a/test/fixtures/jenkins/git-failure-2/console.txt b/test/fixtures/jenkins/git-failure-2/console.txt index a7be340..0aedd8a 100644 --- a/test/fixtures/jenkins/git-failure-2/console.txt +++ b/test/fixtures/jenkins/git-failure-2/console.txt @@ -29,7 +29,7 @@ 19:15:56 Exporting parameter NODEJS_VERSION with Node.js version '11.0.0' 19:15:56 Exporting parameter NODEJS_MAJOR_VERSION with Node.js major version '11' 19:15:56 [rhel72-s390x] $ /bin/sh -xe /tmp/jenkins7325057057705257195.sh -19:15:56 + curl https://raw.githubusercontent.com/nodejs/build/master/jenkins/scripts/node-test-commit-pre.sh +19:15:56 + curl https://raw.githubusercontent.com/nodejs/build/main/jenkins/scripts/node-test-commit-pre.sh 19:15:56 + bash -ex -s before 19:15:56 % Total % Received % Xferd Average Speed Time Time Time Current 19:15:56 Dload Upload Total Spent Left Speed diff --git a/test/fixtures/jenkins/js-flake-1/node-test-commit-19123.json b/test/fixtures/jenkins/js-flake-1/node-test-commit-19123.json index dc078b1..e44cf2f 100644 --- a/test/fixtures/jenkins/js-flake-1/node-test-commit-19123.json +++ b/test/fixtures/jenkins/js-flake-1/node-test-commit-19123.json @@ -28,7 +28,7 @@ { "_class": "hudson.model.StringParameterValue", "name": "REBASE_ONTO", - "value": "origin/master" + "value": "origin/main" }, { "_class": "hudson.model.StringParameterValue", diff --git a/test/fixtures/jenkins/js-flake-1/node-test-commit-linux-nodes=debian9-64-19446.txt b/test/fixtures/jenkins/js-flake-1/node-test-commit-linux-nodes=debian9-64-19446.txt index 9331dad..4fd0d7c 100644 --- a/test/fixtures/jenkins/js-flake-1/node-test-commit-linux-nodes=debian9-64-19446.txt +++ b/test/fixtures/jenkins/js-flake-1/node-test-commit-linux-nodes=debian9-64-19446.txt @@ -30,7 +30,7 @@ Exporting parameter NODEJS_VERSION with Node.js version '11.0.0' Exporting parameter NODEJS_MAJOR_VERSION with Node.js major version '11' [debian9-64] $ /bin/sh -xe /tmp/jenkins3291460991233382964.sh + bash -+ curl https://raw.githubusercontent.com/nodejs/build/master/jenkins/scripts/node-test-commit-pre.sh ++ curl https://raw.githubusercontent.com/nodejs/build/main/jenkins/scripts/node-test-commit-pre.sh % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0100 1165 100 1165 0 0 18116 0 --:--:-- --:--:-- --:--:-- 18203 diff --git a/test/fixtures/jenkins/no-compiler-error/node-test-commit-osx-nodes=osx1010-19307.txt b/test/fixtures/jenkins/no-compiler-error/node-test-commit-osx-nodes=osx1010-19307.txt index c342617..9e18594 100644 --- a/test/fixtures/jenkins/no-compiler-error/node-test-commit-osx-nodes=osx1010-19307.txt +++ b/test/fixtures/jenkins/no-compiler-error/node-test-commit-osx-nodes=osx1010-19307.txt @@ -33,7 +33,7 @@ Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 [osx1010] $ /bin/sh -xe /var/folders/dr/m8hrvy3d71172187rtx7vm380000gp/T/jenkins17599764209366008267.sh -+ curl https://raw.githubusercontent.com/nodejs/build/master/jenkins/scripts/node-test-commit-pre.sh ++ curl https://raw.githubusercontent.com/nodejs/build/main/jenkins/scripts/node-test-commit-pre.sh + bash -ex % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed @@ -76,7 +76,7 @@ Current branch HEAD is up to date, rebase forced. First, rewinding head to replay your work on top of it... Applying: workers,trace_events: set thread name for workers + '[' -n '' ']' -+ curl https://raw.githubusercontent.com/nodejs/build/master/jenkins/scripts/node-test-commit-diagnostics.sh ++ curl https://raw.githubusercontent.com/nodejs/build/main/jenkins/scripts/node-test-commit-diagnostics.sh + bash -ex -s before % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/test/fixtures/jenkins/success/node-test-commit-18960.json b/test/fixtures/jenkins/success/node-test-commit-18960.json index a2dc80b..7f2ee49 100644 --- a/test/fixtures/jenkins/success/node-test-commit-18960.json +++ b/test/fixtures/jenkins/success/node-test-commit-18960.json @@ -28,7 +28,7 @@ { "_class": "hudson.model.StringParameterValue", "name": "REBASE_ONTO", - "value": "origin/master" + "value": "origin/main" }, { "_class": "hudson.model.StringParameterValue", diff --git a/test/fixtures/merged_pr.json b/test/fixtures/merged_pr.json index 06e4da5..50cd704 100644 --- a/test/fixtures/merged_pr.json +++ b/test/fixtures/merged_pr.json @@ -17,7 +17,7 @@ ] }, "title": "lib: awesome changes", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "awesome-changes", "closed": true, "closedAt": "2017-10-28T11:13:43Z", diff --git a/test/fixtures/op_html.json b/test/fixtures/op_html.json index 693703e..e20453e 100644 --- a/test/fixtures/op_html.json +++ b/test/fixtures/op_html.json @@ -1,8 +1,8 @@ [ "

The npm install rules had a hidden dependency on the node binary
\ninstall rule creating the $PREFIX/bin directory.

\n

Because with ./configure --shared no binary is created, the rule
\nsubsequently failed. Fix that by creating the directory before
\ncreating the symlinks to the npm and npx scripts.

\n

(Whether it makes sense to install npm without a node binary is
\na separate question. This commit is not taking positions. :-))

\n

Regression introduced in commit ed8c89a (\"build: fix shared installing
\ntarget\") which, as the commit log indicates, was itself a bug fix for
\nthe ./configure --shared install.

\n

Fixes: #16437
\nRefs: #15148

", - "

Refs: #16293

\n
Checklist
\n\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • commit message follows commit guidelines
    • \n
\n
Affected core subsystem(s)
\n\n

vm

", + "

Refs: #16293

\n
Checklist
\n\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • commit message follows commit guidelines
    • \n
\n
Affected core subsystem(s)
\n\n

vm

", "

Included reference to \\'constant time\\' in crypto.timingSafeEqual description

\n

Fixes : #16504

", - "
Checklist
\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • documentation is changed or added
    • \n
  • commit message follows commit guidelines
    • \n
\n
Affected core subsystem(s)
\n

doc, dgram

\n

Refs: https://en.wikipedia.org/w/index.php?title=IPv6_address&type=revision&diff=809494791&oldid=804196124

", + "
Checklist
\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • documentation is changed or added
    • \n
  • commit message follows commit guidelines
    • \n
\n
Affected core subsystem(s)
\n

doc, dgram

\n

Refs: https://en.wikipedia.org/w/index.php?title=IPv6_address&type=revision&diff=809494791&oldid=804196124

", "

v8.5.5 (2022-03-17)

\n

Bug Fixes

\n\n

Documentation

\n\n

Dependencies

\n", - "

Original commit from v8 repo:

\n
[mac][wasm] Work around MacOS 11.2 code page decommit failures\n\nMacOS 11.2 refuses to set \"no access\" permissions on memory that\nwe previously used for JIT-compiled code. It is still unclear\nwhether this is WAI on the part of the kernel. In the meantime,\nas a workaround, we use madvise(..., MADV_FREE_REUSABLE) instead\nof mprotect(..., NONE) when discarding code pages. This is inspired\nby what Chromium's gin platform does.\n\nFixed: v8:11389\nChange-Id: I866586932573b4253002436ae5eee4e0411c45fc\nReviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2679688\nCommit-Queue: Jakob Kummerow <jkummerow@chromium.org>\nCommit-Queue: Michael Lippautz <mlippautz@chromium.org>\nAuto-Submit: Jakob Kummerow <jkummerow@chromium.org>\nReviewed-by: Michael Lippautz <mlippautz@chromium.org>\nCr-Commit-Position: refs/heads/master@{#72559}\n
\n

Fixes #37061
\nRef: https://bugs.chromium.org/p/v8/issues/detail?id=11389#c18

\n

For test:

\n\n
./node crash.js\n{\"exports\":[],\"reexports\":[]}
" + "

Original commit from v8 repo:

\n
[mac][wasm] Work around MacOS 11.2 code page decommit failures\n\nMacOS 11.2 refuses to set \"no access\" permissions on memory that\nwe previously used for JIT-compiled code. It is still unclear\nwhether this is WAI on the part of the kernel. In the meantime,\nas a workaround, we use madvise(..., MADV_FREE_REUSABLE) instead\nof mprotect(..., NONE) when discarding code pages. This is inspired\nby what Chromium's gin platform does.\n\nFixed: v8:11389\nChange-Id: I866586932573b4253002436ae5eee4e0411c45fc\nReviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2679688\nCommit-Queue: Jakob Kummerow <jkummerow@chromium.org>\nCommit-Queue: Michael Lippautz <mlippautz@chromium.org>\nAuto-Submit: Jakob Kummerow <jkummerow@chromium.org>\nReviewed-by: Michael Lippautz <mlippautz@chromium.org>\nCr-Commit-Position: refs/heads/main@{#72559}\n
\n

Fixes #37061
\nRef: https://bugs.chromium.org/p/v8/issues/detail?id=11389#c18

\n

For test:

\n\n
./node crash.js\n{\"exports\":[],\"reexports\":[]}
" ] diff --git a/test/fixtures/pr_with_backport.json b/test/fixtures/pr_with_backport.json index fe83adb..7ca0354 100644 --- a/test/fixtures/pr_with_backport.json +++ b/test/fixtures/pr_with_backport.json @@ -7,7 +7,7 @@ "name": "Gabriel Schulhof" }, "url": "https://github.com/nodejs/node/pull/30072", - "bodyHTML": "

Build the addons for benchmarks in the same way that the addons for
\ntests are built.

\n

PR-URL: #29995
\nFixes: nodejs/build#1961
\nRefs: 53ca0b9#commitcomment-35494896
\nReviewed-By: @addaleax
\nReviewed-By: @Trott
\nReviewed-By: @BethGriggs
\nReviewed-By: @gengjiawen

\n\n
Checklist
\n\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • commit message follows commit guidelines
    • \n
\n\n

We need this PR along with #30070 because 53ca0b9#commitcomment-35494896

", + "bodyHTML": "

Build the addons for benchmarks in the same way that the addons for
\ntests are built.

\n

PR-URL: #29995
\nFixes: nodejs/build#1961
\nRefs: 53ca0b9#commitcomment-35494896
\nReviewed-By: @addaleax
\nReviewed-By: @Trott
\nReviewed-By: @BethGriggs
\nReviewed-By: @gengjiawen

\n\n
Checklist
\n\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • commit message follows commit guidelines
    • \n
\n\n

We need this PR along with #30070 because 53ca0b9#commitcomment-35494896

", "bodyText": "Build the addons for benchmarks in the same way that the addons for\ntests are built.\nPR-URL: #29995\nFixes: nodejs/build#1961\nRefs: 53ca0b9#commitcomment-35494896\nReviewed-By: @addaleax\nReviewed-By: @Trott\nReviewed-By: @BethGriggs\nReviewed-By: @gengjiawen\n\nChecklist\n\n\n make -j4 test (UNIX), or vcbuild test (Windows) passes\n commit message follows commit guidelines\n\n\nWe need this PR along with #30070 because 53ca0b9#commitcomment-35494896", "labels": { "nodes": [ diff --git a/test/fixtures/pull_requests/doc-only.json b/test/fixtures/pull_requests/doc-only.json index 8f0e42f..0503842 100644 --- a/test/fixtures/pull_requests/doc-only.json +++ b/test/fixtures/pull_requests/doc-only.json @@ -7,7 +7,7 @@ "name": "Antoine du Hamel" }, "url": "https://github.com/nodejs/node/pull/34748", - "bodyHTML": "

This part of the docs aims to contain documentation regarding package configuration that covers both ESM and CJS realms.

\n

Refs: nodejs/modules#539

\n\n
Checklist
\n\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • documentation is changed or added
    • \n
  • commit message follows commit guidelines
    • \n
\n", + "bodyHTML": "

This part of the docs aims to contain documentation regarding package configuration that covers both ESM and CJS realms.

\n

Refs: nodejs/modules#539

\n\n
Checklist
\n\n
    \n
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
    • \n
  • documentation is changed or added
    • \n
  • commit message follows commit guidelines
    • \n
\n", "bodyText": "This part of the docs aims to contain documentation regarding package configuration that covers both ESM and CJS realms.\nRefs: nodejs/modules#539\n\nChecklist\n\n\n make -j4 test (UNIX), or vcbuild test (Windows) passes\n documentation is changed or added\n commit message follows commit guidelines", "labels": { "nodes": [ @@ -39,7 +39,7 @@ ] }, "title": "doc: move package config docs to separate page", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "doc-package-config", "changedFiles": 4, "mergeable": "MERGEABLE", diff --git a/test/fixtures/semver_major_pr.json b/test/fixtures/semver_major_pr.json index a03ae5e..c5bbe78 100644 --- a/test/fixtures/semver_major_pr.json +++ b/test/fixtures/semver_major_pr.json @@ -17,6 +17,6 @@ ] }, "title": "lib: awesome changes", - "baseRefName": "master", + "baseRefName": "main", "headRefName": "awesome-changes" } diff --git a/test/unit/pr_summary.test.js b/test/unit/pr_summary.test.js index 59ec78f..6d846f2 100644 --- a/test/unit/pr_summary.test.js +++ b/test/unit/pr_summary.test.js @@ -42,7 +42,7 @@ describe('PRSummary', () => { ['Author', 'Their Github Account email ' + ' (@pr_author, first-time contributor)'], - ['Branch', 'pr_author:awesome-changes -> nodejs:master'], + ['Branch', 'pr_author:awesome-changes -> nodejs:main'], ['Labels', 'needs-ci, test, doc'], ['Commits', '6'], ['Committers', '3'] @@ -76,7 +76,7 @@ describe('PRSummary', () => { ['Author', 'Their Github Account email ' + ' (@pr_author)'], - ['Branch', 'pr_author:awesome-changes -> nodejs:master'], + ['Branch', 'pr_author:awesome-changes -> nodejs:main'], ['Labels', 'semver-major'], ['Commits', '1'], ['Committers', '1'] @@ -104,7 +104,7 @@ describe('PRSummary', () => { ], table: [ ['Title', 'doc: fix mdn links (#16348)'], - ['Branch', 'pr_author:fix-links -> nodejs:master'], + ['Branch', 'pr_author:fix-links -> nodejs:main'], ['Labels', 'doc'], ['Commits', '1'], ['Committers', '1']