mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: point prepare-release at main (#29394)

Browse source
This commit is contained in:
Jeremy Rose 2021-06-02 12:21:20 -07:00 committed by GitHub
parent 44491b023a
commit 8ce63a9f18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script/release/prepare-release.js
View file

@ -112,7 +112,7 @@ async function createRelease (branchToTarget, isBeta) {
name: `electron ${newVersion}`, name: `electron ${newVersion}`,
body: releaseBody, body: releaseBody,
prerelease: releaseIsPrelease, prerelease: releaseIsPrelease,
target_commitish: newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget target_commitish: newVersion.indexOf('nightly') !== -1 ? 'main' : branchToTarget
}).catch(err => { }).catch(err => {
console.log(`${fail} Error creating new release: `, err); console.log(`${fail} Error creating new release: `, err);
process.exit(1); 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 () { async function changesToRelease () {
const lastCommitWasRelease = new RegExp('^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$', 'g'); 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); const lastCommit = await GitProcess.exec(['log', '-n', '1', '--pretty=format:\'%s\''], ELECTRON_DIR);