From 279b6367035bcc4bd11bca435a9edf6065d61211 Mon Sep 17 00:00:00 2001 From: Kevin Mahoney Date: Wed, 26 Oct 2022 14:56:40 -0400 Subject: [PATCH 1/2] fix prerelease selection logic --- index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index b706b98..c4995f4 100644 --- a/index.js +++ b/index.js @@ -114,18 +114,19 @@ const pkg = getPackageJson(); // case: if default=prerelease, // rc-wording is also set // and does not include any of rc-wording + // and version-type is not strictly set // then unset it and do not run if ( version === 'prerelease' && preReleaseWords && - !messages.some((message) => preReleaseWords.some((word) => message.includes(word))) + !messages.some((message) => preReleaseWords.some((word) => message.includes(word)) && + !versionType) ) { version = null; } // case: if default=prerelease, but rc-wording is NOT set if (version === 'prerelease' && preid) { - version = 'prerelease'; version = `${version} --preid=${preid}`; } From 933159043f2783ec351e13c84f10aadd2d48a056 Mon Sep 17 00:00:00 2001 From: Kevin Mahoney Date: Wed, 26 Oct 2022 15:07:21 -0400 Subject: [PATCH 2/2] fmt --- index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index c4995f4..2b8a7c6 100644 --- a/index.js +++ b/index.js @@ -20,7 +20,7 @@ const pkg = getPackageJson(); console.log("Couldn't find any commits in this event, incrementing patch version..."); } - const allowedTypes = ['major', 'minor', 'patch', 'prerelease'] + const allowedTypes = ['major', 'minor', 'patch', 'prerelease']; if (process.env['INPUT_VERSION-TYPE'] && !allowedTypes.includes(process.env['INPUT_VERSION-TYPE'])) { exitFailure('Invalid version type'); return; @@ -103,7 +103,7 @@ const pkg = getPackageJson(); }), ) ) { - if (foundWord !== ''){ + if (foundWord !== '') { preid = foundWord.split('-')[1]; } version = 'prerelease'; @@ -119,8 +119,7 @@ const pkg = getPackageJson(); if ( version === 'prerelease' && preReleaseWords && - !messages.some((message) => preReleaseWords.some((word) => message.includes(word)) && - !versionType) + !messages.some((message) => preReleaseWords.some((word) => message.includes(word)) && !versionType) ) { version = null; }