From 84dbfee716933a12d152227832d6b121c48c17a1 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Wed, 2 Mar 2022 22:23:32 -0800 Subject: [PATCH] dist --- dist/index.js | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/dist/index.js b/dist/index.js index ea60162e5..4245186af 100644 --- a/dist/index.js +++ b/dist/index.js @@ -128605,12 +128605,16 @@ module.exports = (app, { getRouter }) => { } const targetCommitish = commitish || config['commitish'] || ref - const filterByCommitish = config['filter-by-commitish'] + const { + 'filter-by-commitish': filterByCommitish, + 'tag-prefix': tagPrefix, + } = config const { draftRelease, lastRelease } = await findReleases({ context, targetCommitish, filterByCommitish, + tagPrefix, }) const { commits, pullRequests: mergedPullRequests } = @@ -128997,6 +129001,7 @@ const { SORT_BY, SORT_DIRECTIONS } = __nccwpck_require__(11940) const DEFAULT_CONFIG = Object.freeze({ 'name-template': '', 'tag-template': '', + 'tag-prefix': '', 'change-template': `* $TITLE (#$NUMBER) @$AUTHOR`, 'change-title-escapes': '', 'no-changes-template': `* No changes`, @@ -129131,6 +129136,7 @@ const findReleases = async ({ context, targetCommitish, filterByCommitish, + tagPrefix, }) => { let releases = await context.octokit.paginate( context.octokit.repos.listReleases.endpoint.merge( @@ -129142,9 +129148,12 @@ const findReleases = async ({ log({ context, message: `Found ${releases.length} releases` }) - const filteredReleases = filterByCommitish + const commitishFilteredReleases = filterByCommitish ? releases.filter((r) => targetCommitish.match(`/${r.target_commitish}$`)) : releases + const filteredReleases = tagPrefix + ? commitishFilteredReleases.filter((r) => r.tag_name.startsWith(tagPrefix)) + : commitishFilteredReleases const sortedPublishedReleases = sortReleases( filteredReleases.filter((r) => !r.draft) ) @@ -129411,7 +129420,8 @@ const generateReleaseInfo = ({ // Use the first override parameter to identify // a version, from the most accurate to the least version || tag || name, - resolveVersionKeyIncrement(mergedPullRequests, config) + resolveVersionKeyIncrement(mergedPullRequests, config), + config['tag-prefix'] ) if (versionInfo) { @@ -130060,24 +130070,30 @@ const toSemver = (version) => { return semver.coerce(version) } -const coerceVersion = (input) => { +const coerceVersion = (input, tagPrefix) => { if (!input) { return } + const stripTag = (input) => + tagPrefix && input.startsWith(tagPrefix) + ? input.slice(tagPrefix.length) + : input + return typeof input === 'object' - ? toSemver(input.tag_name) || toSemver(input.name) - : toSemver(input) + ? toSemver(stripTag(input.tag_name)) || toSemver(stripTag(input.name)) + : toSemver(stripTag(input)) } const getVersionInfo = ( release, template, inputVersion, - versionKeyIncrement + versionKeyIncrement, + tagPrefix ) => { - const version = coerceVersion(release) - inputVersion = coerceVersion(inputVersion) + const version = coerceVersion(release, tagPrefix) + inputVersion = coerceVersion(inputVersion, tagPrefix) if (!version && !inputVersion) { return defaultVersionInfo