Skip to content

Commit

Permalink
tools: update main branch name
Browse files Browse the repository at this point in the history
PR-URL: #43440
Refs: #33864
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Beth Griggs <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
  • Loading branch information
F3n67u authored and targos committed Jul 12, 2022
1 parent 7f406fd commit 752380a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions tools/actions/commit-queue.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ REPOSITORY=$2
shift 2

UPSTREAM=origin
DEFAULT_BRANCH=master
DEFAULT_BRANCH=main

COMMIT_QUEUE_LABEL="commit-queue"
COMMIT_QUEUE_FAILED_LABEL="commit-queue-failed"
Expand Down Expand Up @@ -86,7 +86,7 @@ for pr in "$@"; do
commit_title=$(git log -1 --pretty='format:%s')
commit_body=$(git log -1 --pretty='format:%b')
commit_head=$(grep 'Fetched commits as' output | cut -d. -f3 | xargs git rev-parse)

jq -n \
--arg title "${commit_title}" \
--arg body "${commit_body}" \
Expand Down
2 changes: 1 addition & 1 deletion tools/doc/apilinks.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const remoteUrl = execSync(`git config remote.${trackingRemote}.url`);
const repo = (remoteUrl.match(/(\w+\/\w+)\.git\r?\n?$/) ||
['', 'nodejs/node'])[1];

const hash = execSync('git log -1 --pretty=%H') || 'master';
const hash = execSync('git log -1 --pretty=%H') || 'main';
const tag = execSync(`git describe --contains ${hash}`).split('\n')[0] || hash;

// Extract definitions from each file specified.
Expand Down
2 changes: 1 addition & 1 deletion tools/doc/html.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ function altDocs(filename, docCreated, versions) {
}

function editOnGitHub(filename) {
return `<li class="edit_on_github"><a href="https://github.com/nodejs/node/edit/master/doc/api/${filename}.md">Edit on GitHub</a></li>`;
return `<li class="edit_on_github"><a href="https://github.com/nodejs/node/edit/main/doc/api/${filename}.md">Edit on GitHub</a></li>`;
}

function gtocPicker(id) {
Expand Down
2 changes: 1 addition & 1 deletion tools/doc/versions.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const outFile = (process.argv.length > 2 ? process.argv[2] : undefined);

async function versions() {
// The CHANGELOG.md on release branches may not reference newer semver
// majors of Node.js so fetch and parse the version from the master branch.
// majors of Node.js so fetch and parse the version from the main branch.
const url =
'https://raw.githubusercontent.com/nodejs/node/HEAD/CHANGELOG.md';
let changelog;
Expand Down
2 changes: 1 addition & 1 deletion tools/lint-pr-url.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

// Usage:
// git diff upstream/master...HEAD -G"pr-url:" -- "*.md" | \
// git diff upstream/main...HEAD -G"pr-url:" -- "*.md" | \
// ./tools/lint-pr-url.mjs <expected-pr-url>

import process from 'node:process';
Expand Down
2 changes: 1 addition & 1 deletion tools/update-npm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ echo "Please git add npm, commit the new version, and whitespace-fix:"
echo ""
echo "$ git add -A deps/npm"
echo "$ git commit -m \"deps: upgrade npm to $NPM_VERSION\""
echo "$ git rebase --whitespace=fix master"
echo "$ git rebase --whitespace=fix main"
echo ""

0 comments on commit 752380a

Please sign in to comment.