fix(prepare): fix wrong comparison url in the PR summary when getTagN…

…ame is overridden in ship.config.js (#753) * fix(prepare): fix wrong comparison url in the PR summary when getTagName is overridden in ship.config.js * fix: test case Co-authored-by: shipjs <shipjs@test.com>
algolia · Apr 3, 2020 · 4a40920 · 4a40920
1 parent 754d40d
commit 4a40920
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/packages/shipjs-lib/src/lib/config/__tests__/defaultConfig.spec.js b/packages/shipjs-lib/src/lib/config/__tests__/defaultConfig.spec.js
@@ -41,6 +41,7 @@ describe('defaultConfig', () => {
     const baseBranch = 'master';
     const stagingBranch = 'releases/v0.1.1';
     const currentVersion = '0.1.0';
+    const currentTag = 'v0.1.0';
     const nextVersion = '0.1.1';
 
     it('gets message for same branch strategy', () => {
@@ -57,6 +58,7 @@ describe('defaultConfig', () => {
         destinationBranch,
         mergeStrategy,
         currentVersion,
+        currentTag,
         nextVersion,
         publishCommandInStr,
       });

diff --git a/packages/shipjs-lib/src/lib/config/defaultConfig.js b/packages/shipjs-lib/src/lib/config/defaultConfig.js
@@ -31,6 +31,7 @@ export default {
     destinationBranch,
     mergeStrategy,
     currentVersion,
+    currentTag,
     nextVersion,
     releaseType,
     publishCommandInStr,
@@ -45,7 +46,7 @@ export default {
       `- Merge: \`${stagingBranch}\` → \`${destinationBranch}\``,
       ...(mergeStrategy.toSameBranch.includes(baseBranch)
         ? [
-            `- [Compare the changes between the versions](${repoURL}/compare/v${currentVersion}...${stagingBranch})`,
+            `- [Compare the changes between the versions](${repoURL}/compare/${currentTag}...${stagingBranch})`,
             `> :warning: When merging this pull request, you need to **_"Squash and merge"_** and make sure the title starts with \`${pullRequestTitle}\`.`,
             `> After that, a commit \`${pullRequestTitle}\` will be added and \`shipjs trigger\` will be able to trigger the release based on the commit.`,
             `> Fore more information, please refer to the mergeStrategy section of the [guide](https://community.algolia.com/shipjs/guide/useful-config.html#mergestrategy).`,

diff --git a/packages/shipjs/src/flow/prepare.js b/packages/shipjs/src/flow/prepare.js
@@ -114,6 +114,7 @@ async function prepare({
     baseBranch,
     stagingBranch,
     currentVersion,
+    currentTag,
     nextVersion,
     releaseType,
     noBrowse,

diff --git a/packages/shipjs/src/step/prepare/createPullRequest.js b/packages/shipjs/src/step/prepare/createPullRequest.js
@@ -19,6 +19,7 @@ export default async ({
   baseBranch,
   stagingBranch,
   currentVersion,
+  currentTag,
   nextVersion,
   releaseType,
   noBrowse,
@@ -76,6 +77,7 @@ export default async ({
       destinationBranch,
       mergeStrategy,
       currentVersion,
+      currentTag,
       nextVersion,
       releaseType,
       publishCommandInStr,