Skip to content

Commit 2872a38

Browse files
gerkaigerkai
committedApr 7, 2021
chore: update branch references to "main" (#543)
1 parent da36a08 commit 2872a38

19 files changed

+36
-36
lines changed
 

‎.github/workflows/commitlint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Conventional Commit Linter
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88

99
jobs:

‎.github/workflows/nodejs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Node.js CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88

99
jobs:

‎.github/workflows/release-please.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: release-please
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
release-please:

‎CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ git remote add upstream git@github.com:nodejs/node-core-utils.git
1515

1616
#### Which branch?
1717

18-
For developing new features and bug fixes, the `master` branch should be pulled
18+
For developing new features and bug fixes, the `main` branch should be pulled
1919
and built upon.
2020

2121
### Step 2: Branch
@@ -61,7 +61,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
6161
```bash
6262
$ git checkout my-feature-branch
6363
$ git fetch upstream
64-
$ git rebase upstream/master
64+
$ git rebase upstream/main
6565
```
6666

6767
### Step 5: Test
@@ -101,7 +101,7 @@ feature branch. Post a comment in the pull request afterwards.
101101
## Code of Conduct
102102

103103
We follow the
104-
[Node.js Code of Conduct](https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md)
104+
[Node.js Code of Conduct](https://github.com/nodejs/admin/blob/main/CODE_OF_CONDUCT.md)
105105
in this project.
106106

107107
## Developer's Certificate of Origin 1.1

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Node.js Core Utilities
22
[![npm](https://img.shields.io/npm/v/node-core-utils.svg?style=flat-square)](https://npmjs.org/package/node-core-utils)
3-
[![Build Status](https://img.shields.io/github/workflow/status/nodejs/node-core-utils/Node.js%20CI/master?style=flat-square)](https://github.com/nodejs/node-core-utils/workflows/Node.js%20CI/badge.svg?branch=master)
3+
[![Build Status](https://img.shields.io/github/workflow/status/nodejs/node-core-utils/Node.js%20CI/main?style=flat-square)](https://github.com/nodejs/node-core-utils/workflows/Node.js%20CI/badge.svg?branch=main)
44
[![codecov](https://img.shields.io/codecov/c/github/nodejs/node-core-utils.svg?style=flat-square)](https://codecov.io/gh/nodejs/node-core-utils)
55
[![Known Vulnerabilities](https://snyk.io/test/github/nodejs/node-core-utils/badge.svg?style=flat-square)](https://snyk.io/test/github/nodejs/node-core-utils)
66

‎lib/auth.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async function auth(
6464
'If this is your first time running this command, ' +
6565
'follow the instructions to create an access token' +
6666
'. If you prefer to create it yourself on Github, ' +
67-
'see https://github.com/nodejs/node-core-utils/blob/master/README.md.\n');
67+
'see https://github.com/nodejs/node-core-utils/blob/main/README.md.\n');
6868
const credentials = await tryCreateGitHubToken(githubAuth);
6969
username = credentials.user;
7070
token = credentials.token;

‎lib/collaborators.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ async function getCollaborators(cli, request, argv) {
5252
} else {
5353
cli.updateSpinner(
5454
`Getting collaborator contacts from README of ${owner}/${repo}`);
55-
const url = `https://raw.githubusercontent.com/${owner}/${repo}/master/README.md`;
55+
const url = `https://raw.githubusercontent.com/${owner}/${repo}/HEAD/README.md`;
5656
readmeText = await request.text(url);
5757
}
5858

@@ -70,7 +70,7 @@ async function getCollaborators(cli, request, argv) {
7070

7171
function parseCollaborators(readme, cli) {
7272
// This is more or less taken from
73-
// https://github.com/rvagg/iojs-tools/blob/master/pr-metadata/pr-metadata.js
73+
// https://github.com/rvagg/archived-iojs-tools/blob/master/pr-metadata/pr-metadata.js
7474
const collaborators = new Map();
7575
let m;
7676

‎lib/prepare_release.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ class ReleasePreparation {
306306
const { cli } = this;
307307
return await cli.prompt(
308308
'Enter the LTS code name for this release line\n' +
309-
'(Refs: https://github.com/nodejs/Release/blob/master/CODENAMES.md):',
309+
'(Refs: https://github.com/nodejs/Release/blob/main/CODENAMES.md):',
310310
{ questionType: 'input', noSeparator: true, defaultAnswer: '' }
311311
);
312312
}

‎lib/wpt/templates/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Last update:
1313
- <%= path %>: <%= url %><% } %>
1414

1515
[Web Platform Tests]: https://github.com/web-platform-tests/wpt
16-
[`git node wpt`]: https://github.com/nodejs/node-core-utils/blob/master/docs/git-node.md#git-node-wpt
16+
[`git node wpt`]: https://github.com/nodejs/node-core-utils/blob/main/docs/git-node.md#git-node-wpt

‎test/fixtures/README/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,13 @@ Previous releases may also have been signed with one of the following GPG keys:
316316
### Working Groups
317317

318318
Information on the current Node.js Working Groups can be found in the
319-
[TSC repository](https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md).
319+
[TSC repository](https://github.com/nodejs/TSC/blob/main/WORKING_GROUPS.md).
320320

321321
[npm]: https://www.npmjs.com
322322
[Website]: https://nodejs.org/en/
323323
[Contributing to the project]: CONTRIBUTING.md
324324
[Node.js Help]: https://github.com/nodejs/help
325-
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md
325+
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/main/Moderation-Policy.md
326326
[#node.js on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
327327
[#node-dev on chat.freenode.net]: https://webchat.freenode.net?channels=node-dev&uio=d4
328-
[Code of Conduct]: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md
328+
[Code of Conduct]: https://github.com/nodejs/TSC/blob/main/CODE_OF_CONDUCT.md

‎test/fixtures/README/README_alternative.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -302,13 +302,13 @@ Previous releases may also have been signed with one of the following GPG keys:
302302
### Working Groups
303303

304304
Information on the current Node.js Working Groups can be found in the
305-
[TSC repository](https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md).
305+
[TSC repository](https://github.com/nodejs/TSC/blob/main/WORKING_GROUPS.md).
306306

307307
[npm]: https://www.npmjs.com
308308
[Website]: https://nodejs.org/en/
309309
[Contributing to the project]: CONTRIBUTING.md
310310
[Node.js Help]: https://github.com/nodejs/help
311-
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md
311+
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/main/Moderation-Policy.md
312312
[#node.js on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
313313
[#node-dev on chat.freenode.net]: https://webchat.freenode.net?channels=node-dev&uio=d4
314-
[Code of Conduct]: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md
314+
[Code of Conduct]: https://github.com/nodejs/TSC/blob/main/CODE_OF_CONDUCT.md

‎test/fixtures/README/README_no_TSC.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,13 @@ Previous releases may also have been signed with one of the following GPG keys:
306306
### Working Groups
307307

308308
Information on the current Node.js Working Groups can be found in the
309-
[TSC repository](https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md).
309+
[TSC repository](https://github.com/nodejs/TSC/blob/main/WORKING_GROUPS.md).
310310

311311
[npm]: https://www.npmjs.com
312312
[Website]: https://nodejs.org/en/
313313
[Contributing to the project]: CONTRIBUTING.md
314314
[Node.js Help]: https://github.com/nodejs/help
315-
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md
315+
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/main/Moderation-Policy.md
316316
[#node.js on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
317317
[#node-dev on chat.freenode.net]: https://webchat.freenode.net?channels=node-dev&uio=d4
318-
[Code of Conduct]: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md
318+
[Code of Conduct]: https://github.com/nodejs/TSC/blob/main/CODE_OF_CONDUCT.md

‎test/fixtures/README/README_no_TSCE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ Previous releases may also have been signed with one of the following GPG keys:
307307
### Working Groups
308308

309309
Information on the current Node.js Working Groups can be found in the
310-
[TSC repository](https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md).
310+
[TSC repository](https://github.com/nodejs/TSC/blob/main/WORKING_GROUPS.md).
311311

312312
[npm]: https://www.npmjs.com
313313
[Website]: https://nodejs.org/en/
314314
[Contributing to the project]: CONTRIBUTING.md
315315
[Node.js Help]: https://github.com/nodejs/help
316-
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md
316+
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/main/Moderation-Policy.md
317317
[#node.js on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
318318
[#node-dev on chat.freenode.net]: https://webchat.freenode.net?channels=node-dev&uio=d4
319-
[Code of Conduct]: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md
319+
[Code of Conduct]: https://github.com/nodejs/TSC/blob/main/CODE_OF_CONDUCT.md

‎test/fixtures/README/README_no_collaboratorE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ Previous releases may also have been signed with one of the following GPG keys:
307307
### Working Groups
308308

309309
Information on the current Node.js Working Groups can be found in the
310-
[TSC repository](https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md).
310+
[TSC repository](https://github.com/nodejs/TSC/blob/main/WORKING_GROUPS.md).
311311

312312
[npm]: https://www.npmjs.com
313313
[Website]: https://nodejs.org/en/
314314
[Contributing to the project]: CONTRIBUTING.md
315315
[Node.js Help]: https://github.com/nodejs/help
316-
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md
316+
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/main/Moderation-Policy.md
317317
[#node.js on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
318318
[#node-dev on chat.freenode.net]: https://webchat.freenode.net?channels=node-dev&uio=d4
319-
[Code of Conduct]: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md
319+
[Code of Conduct]: https://github.com/nodejs/TSC/blob/main/CODE_OF_CONDUCT.md

‎test/fixtures/README/README_no_collaborators.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,13 @@ Previous releases may also have been signed with one of the following GPG keys:
300300
### Working Groups
301301

302302
Information on the current Node.js Working Groups can be found in the
303-
[TSC repository](https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md).
303+
[TSC repository](https://github.com/nodejs/TSC/blob/main/WORKING_GROUPS.md).
304304

305305
[npm]: https://www.npmjs.com
306306
[Website]: https://nodejs.org/en/
307307
[Contributing to the project]: CONTRIBUTING.md
308308
[Node.js Help]: https://github.com/nodejs/help
309-
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md
309+
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/main/Moderation-Policy.md
310310
[#node.js on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
311311
[#node-dev on chat.freenode.net]: https://webchat.freenode.net?channels=node-dev&uio=d4
312-
[Code of Conduct]: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md
312+
[Code of Conduct]: https://github.com/nodejs/TSC/blob/main/CODE_OF_CONDUCT.md

‎test/fixtures/README/README_unordered.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,13 @@ Previous releases may also have been signed with one of the following GPG keys:
312312
### Working Groups
313313

314314
Information on the current Node.js Working Groups can be found in the
315-
[TSC repository](https://github.com/nodejs/TSC/blob/master/WORKING_GROUPS.md).
315+
[TSC repository](https://github.com/nodejs/TSC/blob/main/WORKING_GROUPS.md).
316316

317317
[npm]: https://www.npmjs.com
318318
[Website]: https://nodejs.org/en/
319319
[Contributing to the project]: CONTRIBUTING.md
320320
[Node.js Help]: https://github.com/nodejs/help
321-
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md
321+
[Node.js Moderation Policy]: https://github.com/nodejs/TSC/blob/main/Moderation-Policy.md
322322
[#node.js on chat.freenode.net]: https://webchat.freenode.net?channels=node.js&uio=d4
323323
[#node-dev on chat.freenode.net]: https://webchat.freenode.net?channels=node-dev&uio=d4
324-
[Code of Conduct]: https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md
324+
[Code of Conduct]: https://github.com/nodejs/TSC/blob/main/CODE_OF_CONDUCT.md

‎test/unit/auth.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const FIRST_TIME_MSG =
1111
'If this is your first time running this command, ' +
1212
'follow the instructions to create an access token. ' +
1313
'If you prefer to create it yourself on Github, ' +
14-
'see https://github.com/nodejs/node-core-utils/blob/master/README.md.';
14+
'see https://github.com/nodejs/node-core-utils/blob/main/README.md.';
1515

1616
const MOCKED_TOKEN = JSON.stringify({
1717
github: 'bnlhbmNhdDowMTIzNDU2Nzg5YWJjZGVm'

‎test/unit/collaborators.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('collaborators', function() {
9090
function mockRequest(content, argv) {
9191
const { owner, repo } = argv;
9292
const expectedUrl =
93-
`https://raw.githubusercontent.com/${owner}/${repo}/master/README.md`;
93+
`https://raw.githubusercontent.com/${owner}/${repo}/HEAD/README.md`;
9494
return {
9595
async text(url) {
9696
assert.strictEqual(url, expectedUrl);

‎test/unit/pr_data.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('PRData', function() {
3030
};
3131

3232
request.text
33-
.withArgs('https://raw.githubusercontent.com/nodejs/node/master/README.md')
33+
.withArgs('https://raw.githubusercontent.com/nodejs/node/HEAD/README.md')
3434
.returns(Promise.resolve(readme));
3535
request.text.returns(new Error('unknown query'));
3636
request.gql.withArgs('PR').returns(Promise.resolve(rawPR));

0 commit comments

Comments
 (0)
Please sign in to comment.