From 8ce63a9f185f181b68bc484fc85d3a101bdce24e Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Wed, 2 Jun 2021 12:21:20 -0700 Subject: [PATCH] refactor: point prepare-release at main (#29394) --- script/release/prepare-release.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/release/prepare-release.js b/script/release/prepare-release.js index c70546ce79df..d83050e0c7ca 100755 --- a/script/release/prepare-release.js +++ b/script/release/prepare-release.js @@ -112,7 +112,7 @@ async function createRelease (branchToTarget, isBeta) { name: `electron ${newVersion}`, body: releaseBody, prerelease: releaseIsPrelease, - target_commitish: newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget + target_commitish: newVersion.indexOf('nightly') !== -1 ? 'main' : branchToTarget }).catch(err => { console.log(`${fail} Error creating new release: `, err); process.exit(1); @@ -180,7 +180,7 @@ async function promptForVersion (version) { }); } -// function to determine if there have been commits to master since the last release +// function to determine if there have been commits to main since the last release async function changesToRelease () { const lastCommitWasRelease = new RegExp('^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$', 'g'); const lastCommit = await GitProcess.exec(['log', '-n', '1', '--pretty=format:\'%s\''], ELECTRON_DIR);