Skip to content

Commit a4a7b28

Browse files
authored
Update branch references from master to main (#886)
1 parent a2ad0a1 commit a4a7b28

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
with:
2222
node-version: ${{ matrix.node-version }}
2323
- run: npm install
24-
- run: CLANG_FORMAT_START=refs/remotes/origin/master npm run lint
24+
- run: CLANG_FORMAT_START=refs/remotes/origin/main npm run lint

doc/creating_a_release.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ These are the steps to follow to create a new release:
2323
* Open an issue in the **node-addon-api** repo documenting the intent to create a
2424
new release. Give people some time to comment or suggest PRs that should land first.
2525

26-
* Validate all tests pass by running npm test on master.
26+
* Validate all tests pass by running `npm test` on the `main` branch.
2727

2828
* Update the version in **package.json** appropriately.
2929

30-
* Update the [README.md](https://github.com/nodejs/node-addon-api/blob/master/README.md)
30+
* Update the [README.md](https://github.com/nodejs/node-addon-api/blob/main/README.md)
3131
to show the new version as the latest.
3232

3333
* Generate the changelog for the new version using **changelog maker** tool. From
@@ -36,12 +36,12 @@ the route folder of the repo launch the following command:
3636
```bash
3737
> changelog-maker
3838
```
39-
* Use the output generated by **changelog maker** to update the [CHANGELOG.md](https://github.com/nodejs/node-addon-api/blob/master/CHANGELOG.md)
39+
* Use the output generated by **changelog maker** to update the [CHANGELOG.md](https://github.com/nodejs/node-addon-api/blob/main/CHANGELOG.md)
4040
following the style used in publishing the previous release.
4141

4242
* Add any new contributors to the "contributors" section in the package.json
4343

44-
* Validate all tests pass by running npm test on master.
44+
* Validate all tests pass by running `npm test` on the `main` branch.
4545

4646
* Use **[CI](https://ci.nodejs.org/view/x%20-%20Abi%20stable%20module%20API/job/node-test-node-addon-api-new/)**
4747
to validate tests pass (note there are still some issues on SmartOS and

tools/clang-format.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const spawn = require('child_process').spawnSync;
44
const path = require('path');
55

66
const filesToCheck = ['*.h', '*.cc'];
7-
const CLANG_FORMAT_START = process.env.CLANG_FORMAT_START || 'master';
7+
const CLANG_FORMAT_START = process.env.CLANG_FORMAT_START || 'main';
88

99
function main(args) {
1010
let clangFormatPath = path.dirname(require.resolve('clang-format'));
@@ -35,9 +35,9 @@ function main(args) {
3535
console.error(`
3636
ERROR: please run ${fixCmd} to format changes in your commit
3737
Note that when running the command locally, please keep your local
38-
master branch and working branch up to date with nodejs/node-addon-api
38+
main branch and working branch up to date with nodejs/node-addon-api
3939
to exclude un-related complains.
40-
Or you can run "env CLANG_FORMAT_START=upstream/master ${fixCmd}".`);
40+
Or you can run "env CLANG_FORMAT_START=upstream/main ${fixCmd}".`);
4141
return 1;
4242
}
4343
}

0 commit comments

Comments
 (0)