github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: version-utils respects main (#29390)

Browse Source 
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
This commit is contained in:
trop[bot]
2021-05-27 18:44:44 -07:00
committed by GitHub
parent bf39abb5db
commit 66f0852fdf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
script/release/version-utils.js
View File

@@ -65,8 +65,9 @@ async function nextNightly (v) {
const pre = `nightly.${getCurrentDate()}`;
const branch = (await GitProcess.exec(['rev-parse', '--abbrev-ref', 'HEAD'], ELECTRON_DIR)).stdout.trim();
if (branch === 'master') {
next = semver.inc(await getLastMajorForMaster(), 'major');
// TODO(main-migration): Simplify once main branch is renamed
if (branch === 'master' || branch === 'main') {
next = semver.inc(await getLastMajorForMain(), 'major');
} else if (isStable(v)) {
next = semver.inc(next, 'patch');
}
@@ -74,7 +75,7 @@ async function nextNightly (v) {
return `${next}-${pre}`;
}
async function getLastMajorForMaster () {
async function getLastMajorForMain () {
let branchNames;
const result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]*-x-y'], ELECTRON_DIR);
if (result.exitCode === 0) {