From 6488b241dc622bfca791c8a379b58cddd408e1f4 Mon Sep 17 00:00:00 2001 From: jonaslagoni Date: Thu, 26 May 2022 00:15:17 +0200 Subject: [PATCH] fix: bump version not working --- src/bumper.js | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/bumper.js b/src/bumper.js index 46660819..f34f15ab 100644 --- a/src/bumper.js +++ b/src/bumper.js @@ -45,11 +45,12 @@ module.exports = async ( } else if (type === 'assembly') { currentVersion = getCurrentVersionAssembly(projectFile); } + logInfo(`Current version: ${currentVersion}`); const commitMessages = await getCommitMessages(gitEvents, token); logInfo(`Found commit messages: ${JSON.stringify(commitMessages, null, 4)}`); - const relevantCommitMessages = getRelevantCommitMessages(commitMessages, releaseCommitMessageRegex ? releaseCommitMessageRegex : commitMessageToUse, tagPrefix); + const relevantCommitMessages = getRelevantCommitMessages(commitMessages, releaseCommitMessageRegex, tagPrefix); logInfo(`Relevant commit messages: ${JSON.stringify(relevantCommitMessages, null, 4)}`); if (relevantCommitMessages.length === 0) { exitSuccess('No action necessary because latest commit was a bump!'); @@ -58,19 +59,6 @@ module.exports = async ( const {doMajorVersion, doMinorVersion, doPatchVersion, doPreReleaseVersion} = analyseVersionChange(majorWording, minorWording, patchWording, rcWording, commitMessages); - // case: if default=prerelease, - // rc-wording is also set - // and does not include any of rc-wording - // then unset it and do not run - if ( - doPreReleaseVersion && - rcWording && - !commitMessages.some((message) => rcWording.some((word) => message.includes(word))) - ) { - logInfo('Default bump version sat to a nonexisting prerelease wording, skipping bump.'); - return false; - } - //Should we do any version updates? if (!doMajorVersion && !doMinorVersion && !doPatchVersion && !doPreReleaseVersion) { logInfo('Could not find any version bump to make, skipping.'); @@ -92,8 +80,7 @@ module.exports = async ( // We want to override the branch that we are pulling / pushing to currentBranch = targetBranch; } - logInfo('Current branch:', currentBranch); - logInfo('Current version:', currentVersion); + logInfo(`Current branch: ${currentBranch}`); //Bump version const newVersion = bumpVersion(currentVersion, doMajorVersion, doMinorVersion, doPatchVersion, doPreReleaseVersion, preReleaseId);