Update branch references from master to main (#886)

nodejs · Jan 26, 2021 · a4a7b28 · a4a7b28
1 parent a2ad0a1
commit a4a7b28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -21,4 +21,4 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install
-    - run: CLANG_FORMAT_START=refs/remotes/origin/master npm run lint
+    - run: CLANG_FORMAT_START=refs/remotes/origin/main npm run lint
diff --git a/doc/creating_a_release.md b/doc/creating_a_release.md
@@ -23,11 +23,11 @@ These are the steps to follow to create a new release:
 * Open an issue in the **node-addon-api** repo documenting the intent to create a
 new release. Give people some time to comment or suggest PRs that should land first.
 
-* Validate all tests pass by running npm test on master.
+* Validate all tests pass by running `npm test` on the `main` branch.
 
 * Update the version in **package.json** appropriately.
 
-* Update the [README.md](https://github.com/nodejs/node-addon-api/blob/master/README.md)
+* Update the [README.md](https://github.com/nodejs/node-addon-api/blob/main/README.md)
 to show the new version as the latest.
 
 * 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:
     ```bash
     > changelog-maker
     ```
-* Use the output generated by **changelog maker** to update the [CHANGELOG.md](https://github.com/nodejs/node-addon-api/blob/master/CHANGELOG.md)
+* Use the output generated by **changelog maker** to update the [CHANGELOG.md](https://github.com/nodejs/node-addon-api/blob/main/CHANGELOG.md)
 following the style used in publishing the previous release.
 
 * Add any new contributors to the "contributors" section in the package.json
 
-* Validate all tests pass by running npm test on master.
+* Validate all tests pass by running `npm test` on the `main` branch.
 
 * Use **[CI](https://ci.nodejs.org/view/x%20-%20Abi%20stable%20module%20API/job/node-test-node-addon-api-new/)**
 to validate tests pass (note there are still some issues on SmartOS and

diff --git a/tools/clang-format.js b/tools/clang-format.js
@@ -4,7 +4,7 @@ const spawn = require('child_process').spawnSync;
 const path = require('path');
 
 const filesToCheck = ['*.h', '*.cc'];
-const CLANG_FORMAT_START = process.env.CLANG_FORMAT_START || 'master';
+const CLANG_FORMAT_START = process.env.CLANG_FORMAT_START || 'main';
 
 function main(args) {
   let clangFormatPath = path.dirname(require.resolve('clang-format'));
@@ -35,9 +35,9 @@ function main(args) {
     console.error(`
       ERROR: please run ${fixCmd} to format changes in your commit
         Note that when running the command locally, please keep your local
-        master branch and working branch up to date with nodejs/node-addon-api
+        main branch and working branch up to date with nodejs/node-addon-api
         to exclude un-related complains.
-        Or you can run "env CLANG_FORMAT_START=upstream/master ${fixCmd}".`);
+        Or you can run "env CLANG_FORMAT_START=upstream/main ${fixCmd}".`);
     return 1;
   }
 }