@@ -11,14 +11,13 @@ const map = (transform, flush = undefined) => new Transform({ objectMode: true,
11
11
const vfs = require ( 'vinyl-fs' )
12
12
const zip = require ( '@vscode/gulp-vinyl-zip' )
13
13
14
- function getNextReleaseNumber ( { octokit, owner, repo, variant } ) {
15
- const prefix = `${ variant } -`
16
- const filter = ( { name } ) => name . startsWith ( prefix ) && ! name . endsWith ( '-latest' )
14
+ function getNextReleaseNumber ( { octokit, owner, repo, tagPrefix, latestTagName } ) {
15
+ const filter = ( { name } ) => name !== latestTagName && name . startsWith ( tagPrefix )
17
16
return collectReleases ( { octokit, owner, repo, filter } ) . then ( ( releases ) => {
18
17
if ( releases . length ) {
19
18
releases . sort ( ( a , b ) => - 1 * a . name . localeCompare ( b . name , 'en' , { numeric : true } ) )
20
19
const latestName = releases [ 0 ] . name
21
- return Number ( latestName . slice ( prefix . length ) ) + 1
20
+ return Number ( latestName . slice ( tagPrefix . length ) ) + 1
22
21
} else {
23
22
return 1
24
23
}
@@ -80,8 +79,9 @@ module.exports = (dest, bundleName, owner, repo, ref, token, updateBranch, lates
80
79
let variant = ref ? ref . replace ( / ^ r e f s \/ h e a d s \/ / , '' ) : 'main'
81
80
if ( variant === 'main' ) variant = 'prod'
82
81
ref = ref . replace ( / ^ r e f s \/ / , '' )
83
- const tagName = `${ variant } -${ await getNextReleaseNumber ( { octokit, owner, repo, variant } ) } `
84
- const latestTagName = latestAlias === false ? undefined : `${ variant } -${ latestAlias || 'latest' } `
82
+ const tagPrefix = `${ variant } -`
83
+ const latestTagName = latestAlias === false ? undefined : `${ tagPrefix } ${ latestAlias || 'latest' } `
84
+ const tagName = `${ tagPrefix } ${ await getNextReleaseNumber ( { octokit, owner, repo, tagPrefix, latestTagName } ) } `
85
85
const message = `Release ${ tagName } `
86
86
const bundleFileBasename = `${ bundleName } -bundle.zip`
87
87
const bundleFile = await versionBundle ( ospath . join ( dest , bundleFileBasename ) , tagName )
0 commit comments