diff --git a/tools/actions/commit-queue.sh b/tools/actions/commit-queue.sh index 309c1c5406b..0df819e47ee 100755 --- a/tools/actions/commit-queue.sh +++ b/tools/actions/commit-queue.sh @@ -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" @@ -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}" \ diff --git a/tools/doc/apilinks.mjs b/tools/doc/apilinks.mjs index a1b660f1cfa..749bf7966aa 100644 --- a/tools/doc/apilinks.mjs +++ b/tools/doc/apilinks.mjs @@ -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. diff --git a/tools/doc/html.mjs b/tools/doc/html.mjs index 1c5ad61182b..1caffa7158c 100644 --- a/tools/doc/html.mjs +++ b/tools/doc/html.mjs @@ -522,7 +522,7 @@ function altDocs(filename, docCreated, versions) { } function editOnGitHub(filename) { - return `