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

build: fix nightly version bumping (#21079)

Browse source 
* build: fix nightly version bumping

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

* Update version-bump-spec.ts
This commit is contained in:
Samuel Attard 2019-11-12 08:36:03 -08:00 • committed by GitHub
commit c0657a4ca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
script/release/version-utils.js
View file

@ -72,7 +72,7 @@ async function nextNightly (v) {
async function getLastMajorForMaster () { async function getLastMajorForMaster () {
let branchNames 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) { if (result.exitCode === 0) {
branchNames = result.stdout.trim().split('\n') branchNames = result.stdout.trim().split('\n')
const filtered = branchNames.map(b => b.replace('origin/', '')) const filtered = branchNames.map(b => b.replace('origin/', ''))
@ -83,7 +83,7 @@ async function getLastMajorForMaster () {
} }
function getNextReleaseBranch (branches) { 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) return converted.reduce((v1, v2) => semver.gt(v1, v2) ? v1 : v2)
} }

7
spec-main/version-bump-spec.ts
View file

@ -68,6 +68,13 @@ describe('version-bumper', () => {
expect(matches).to.have.lengthOf(1) 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', () => { it('throws error when bumping to beta from stable', () => {
const version = 'v2.0.0' const version = 'v2.0.0'
return expect( return expect(