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

build: fix issues for stable release we fixed in 5-0-x (#18064)

Browse source 
* build: fix release notes generation

* build: fix bump-version script for stable releases
This commit is contained in:
Samuel Attard 2019-04-30 11:36:39 -07:00 committed by Shelley Vohr
parent fcf0af15de
commit f2d41b7812
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/bump-version.js
View file

@ -144,7 +144,7 @@ async function updateVersionH (components) {
const filePath = path.resolve(__dirname, '..', 'atom', 'common', 'atom_version.h')
const data = await readFile(filePath, 'utf8')
const arr = data.split('\n')
const pre = components.pre != null ? `-${components.pre[0]}.${components.pre[1]}` : null
const pre = components.pre && components.pre.length >= 2 ? `-${components.pre[0]}.${components.pre[1]}` : null
arr.forEach((item, idx) => {
if (item.includes('#define ATOM_MAJOR_VERSION')) {

2
script/lib/version-utils.js
View file

@ -32,7 +32,7 @@ const isStable = v => {
const makeVersion = (components, delim, pre = preType.NONE) => {
let version = [components.major, components.minor, components.patch].join(delim)
if (pre === preType.PARTIAL) {
version += `${delim}${components.pre[1]}`
version += `${delim}${components.pre[1] || 0}`
} else if (pre === preType.FULL) {
version += `-${components.pre[0]}${delim}${components.pre[1]}`
}

2
script/prepare-release.js
View file

@ -100,7 +100,7 @@ async function createRelease (branchToTarget, isBeta) {
}
releaseIsPrelease = true
} else {
releaseBody = releaseNotes
releaseBody = releaseNotes.text
}
const release = await octokit.repos.createRelease({