зеркало из https://github.com/electron/electron.git
build: fix nightly version bumping (#21079)
* 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:
Родитель
d9d89eeabc
Коммит
c0657a4ca7
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
@ -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(
|
||||
|
|
Загрузка…
Ссылка в новой задаче