build: fix nightly version bumping (electron#21079)

MarshallOfSound · web-flow · commit c0657a4ca761 · 2019-11-12T08:36:03.000-08:00
* build: fix nightly version bumping

* spec: add a test for bumping nightlies beyond the 8-x-y branch switch

* Update version-bump-spec.ts
diff --git a/script/release/version-utils.js b/script/release/version-utils.js
@@ -72,7 +72,7 @@ async function nextNightly (v) {
 
 async function getLastMajorForMaster () {
   let branchNames
-  const result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]-[0-9]-x'], ELECTRON_DIR)
+  const result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]*-x-y'], ELECTRON_DIR)
   if (result.exitCode === 0) {
     branchNames = result.stdout.trim().split('\n')
     const filtered = branchNames.map(b => b.replace('origin/', ''))
@@ -83,7 +83,7 @@ async function getLastMajorForMaster () {
 }
 
 function getNextReleaseBranch (branches) {
-  const converted = branches.map(b => b.replace(/-/g, '.').replace('x', '0'))
+  const converted = branches.map(b => b.replace(/-/g, '.').replace('x', '0').replace('y', '0'))
   return converted.reduce((v1, v2) => semver.gt(v1, v2) ? v1 : v2)
 }
 
diff --git a/spec-main/version-bump-spec.ts b/spec-main/version-bump-spec.ts
@@ -68,6 +68,13 @@ describe('version-bumper', () => {
       expect(matches).to.have.lengthOf(1)
     })
 
+    it('bumps to a nightly version above our switch from N-0-x to N-x-y branch names', async () => {
+      const version = 'v2.0.0-nightly.19950901'
+      const next = await nextVersion('nightly', version)
+      // If it starts with v8 then we didn't bump above the 8-x-y branch
+      expect(next.startsWith('v8')).to.equal(false)
+    })
+
     it('throws error when bumping to beta from stable', () => {
       const version = 'v2.0.0'
       return expect(

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ async function nextNightly (v) {`
`72`	`72`
`73`	`73`	`async function getLastMajorForMaster () {`
`74`	`74`	`let branchNames`
`75`		`- const result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]-[0-9]-x'], ELECTRON_DIR)`
	`75`	`+ const result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]*-x-y'], ELECTRON_DIR)`
`76`	`76`	`if (result.exitCode === 0) {`
`77`	`77`	`branchNames = result.stdout.trim().split('\n')`
`78`	`78`	`const filtered = branchNames.map(b => b.replace('origin/', ''))`
`@@ -83,7 +83,7 @@ async function getLastMajorForMaster () {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`function getNextReleaseBranch (branches) {`
`86`		`- const converted = branches.map(b => b.replace(/-/g, '.').replace('x', '0'))`
	`86`	`+ const converted = branches.map(b => b.replace(/-/g, '.').replace('x', '0').replace('y', '0'))`
`87`	`87`	`return converted.reduce((v1, v2) => semver.gt(v1, v2) ? v1 : v2)`
`88`	`88`	`}`
`89`	`89`