build: fix issues for stable release we fixed in 5-0-x (#18064)
* build: fix release notes generation * build: fix bump-version script for stable releases
This commit is contained in:
parent
fcf0af15de
commit
f2d41b7812
3 changed files with 3 additions and 3 deletions
|
@ -144,7 +144,7 @@ async function updateVersionH (components) {
|
||||||
const filePath = path.resolve(__dirname, '..', 'atom', 'common', 'atom_version.h')
|
const filePath = path.resolve(__dirname, '..', 'atom', 'common', 'atom_version.h')
|
||||||
const data = await readFile(filePath, 'utf8')
|
const data = await readFile(filePath, 'utf8')
|
||||||
const arr = data.split('\n')
|
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) => {
|
arr.forEach((item, idx) => {
|
||||||
if (item.includes('#define ATOM_MAJOR_VERSION')) {
|
if (item.includes('#define ATOM_MAJOR_VERSION')) {
|
||||||
|
|
|
@ -32,7 +32,7 @@ const isStable = v => {
|
||||||
const makeVersion = (components, delim, pre = preType.NONE) => {
|
const makeVersion = (components, delim, pre = preType.NONE) => {
|
||||||
let version = [components.major, components.minor, components.patch].join(delim)
|
let version = [components.major, components.minor, components.patch].join(delim)
|
||||||
if (pre === preType.PARTIAL) {
|
if (pre === preType.PARTIAL) {
|
||||||
version += `${delim}${components.pre[1]}`
|
version += `${delim}${components.pre[1] || 0}`
|
||||||
} else if (pre === preType.FULL) {
|
} else if (pre === preType.FULL) {
|
||||||
version += `-${components.pre[0]}${delim}${components.pre[1]}`
|
version += `-${components.pre[0]}${delim}${components.pre[1]}`
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,7 +100,7 @@ async function createRelease (branchToTarget, isBeta) {
|
||||||
}
|
}
|
||||||
releaseIsPrelease = true
|
releaseIsPrelease = true
|
||||||
} else {
|
} else {
|
||||||
releaseBody = releaseNotes
|
releaseBody = releaseNotes.text
|
||||||
}
|
}
|
||||||
|
|
||||||
const release = await octokit.repos.createRelease({
|
const release = await octokit.repos.createRelease({
|
||||||
|
|
Loading…
Reference in a new issue