Merge pull request #24 from mcfly-io/revert-hf

mcfly-io · Feb 25, 2020 · 420099b · 420099b
2 parents 7613746 + e78ef9a
commit 420099b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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) {