diff --git a/bin/mcfly-semantic-release.js b/bin/mcfly-semantic-release.js index 66b0108..9e56e51 100755 --- a/bin/mcfly-semantic-release.js +++ b/bin/mcfly-semantic-release.js @@ -57,7 +57,7 @@ fileHelper.getFiles(args.files) .then((username) => { msg.username = username; if (username) { - console.log(`Hello ${chalk.bold(chalk.cyan(username))}, let's publish a new ${args.hotfix ? 'hotfix' : ''} version ${chalk.bold(chalk.yellow(msg.nextVersion))}...`); + console.log(`Hello ${chalk.bold(chalk.cyan(username))}, let's publish a new ${args.hotfix ? 'hotfix ' : ''}version ${chalk.bold(chalk.yellow(msg.nextVersion))}...`); } return inquirer.prompt([{ type: 'input', @@ -108,9 +108,6 @@ fileHelper.getFiles(args.files) .delay(1000) .then((msg) => { console.log(chalk.yellow('Publishing version...')); - if (args.hotfix) { - msg.nextVersion = `${msg.nextVersion}-hf`; - } return retryHelper .retry(function () { return githubHelper.createRelease(msg); diff --git a/lib/gitHelper.js b/lib/gitHelper.js index 2038c7a..42365ee 100644 --- a/lib/gitHelper.js +++ b/lib/gitHelper.js @@ -19,7 +19,7 @@ const commitVersion = async function (version, production, files, hotfix = false const currentBranch = hotfix ? await getCurrentBranch() : 'master'; await git.add(files); await git.commit(commitMessage); - await git.addAnnotatedTag(`${version}${hotfix ? '-hf' : ''}`, `v${version}${hotfix ? '-hf' : ''}`); + await git.addAnnotatedTag(version, `v${version}`); await git.push('origin', currentBranch); await git.pushTags('origin'); } catch (e) {