fix(prepare): fetch tags before figuring out next version (#468)

algolia · Nov 30, 2019 · 045bbc0 · 045bbc0
1 parent 18cc7e4
commit 045bbc0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/packages/shipjs/src/flow/prepare.js b/packages/shipjs/src/flow/prepare.js
@@ -5,6 +5,7 @@ import printDryRunBanner from '../step/printDryRunBanner';
 import validate from '../step/prepare/validate';
 import validateMergeStrategy from '../step/prepare/validateMergeStrategy';
 import pull from '../step/pull';
+import fetchTags from '../step/prepare/fetchTags';
 import push from '../step/prepare/push';
 import getNextVersion from '../step/prepare/getNextVersion';
 import confirmNextVersion from '../step/prepare/confirmNextVersion';
@@ -47,6 +48,7 @@ async function prepare({
   validateMergeStrategy({ config });
   const { remote } = config;
   pull({ remote, currentBranch: baseBranch, dir, dryRun });
+  fetchTags({ dir, dryRun });
   push({ remote, currentBranch: baseBranch, dir, dryRun });
   let { nextVersion } = getNextVersion({ currentVersion, dir });
   nextVersion = await confirmNextVersion({

diff --git a/packages/shipjs/src/step/prepare/fetchTags.js b/packages/shipjs/src/step/prepare/fetchTags.js
@@ -0,0 +1,7 @@
+import runStep from '../runStep';
+import { run } from '../../util';
+
+export default ({ dir, dryRun }) =>
+  runStep({ title: 'Fetching tags.' }, () => {
+    run({ command: `git fetch --tags`, dir, dryRun });
+  });