Revert "do not leave comment if custom version has not been set (#212)"

This reverts commit e163d6f.

Author: meorphis

src/strategies/base.ts

@@ -22,6 +22,7 @@ import {
   MANIFEST_PULL_REQUEST_TITLE_PATTERN,
   ExtraFile,
   DEFAULT_CUSTOM_VERSION_LABEL,
+  DEFAULT_RELEASE_PLEASE_MANIFEST,
 } from '../manifest';
 import {DefaultVersioningStrategy} from '../versioning-strategies/default';
 import {DefaultChangelogNotes} from '../changelog-notes/default';
@@ -274,12 +275,14 @@ export abstract class BaseStrategy implements Strategy {
     labels = [],
     latestRelease,
     draft,
+    manifestPath,
   }: {
     commits: Commit[];
     latestRelease?: Release;
     draft?: boolean;
     labels?: string[];
     existingPullRequest?: PullRequest;
+    manifestPath?: string;
   }): Promise<ReleasePullRequest | undefined> {
     this.logger.info(`Considering: ${commits.length} raw commits`);
 
@@ -388,7 +391,13 @@ To set a custom version be sure to use the [semantic versioning format](https://
       } else {
         // look at the manifest from release branch and compare against version from PR title
         try {
-          if (newVersion.toString() !== existingPRTitleVersion.toString()) {
+          const manifest =
+            (await this.github.getFileJson<Record<string, string>>(
+              manifestPath || DEFAULT_RELEASE_PLEASE_MANIFEST,
+              existingPullRequest.headBranchName
+            )) || {};
+          const componentVersion = manifest[component || '.'];
+          if (componentVersion !== existingPRTitleVersion?.toString()) {
             // version from title has been edited, add custom version label, a comment, and use the title version
             this.github.addIssueLabels(
               [DEFAULT_CUSTOM_VERSION_LABEL],

src/strategies/java.ts

@@ -79,12 +79,14 @@ export class Java extends BaseStrategy {
     labels = [],
     latestRelease,
     draft,
+    manifestPath,
   }: {
     commits: ConventionalCommit[];
     latestRelease?: Release;
     draft?: boolean;
     labels?: string[];
     existingPullRequest?: PullRequest;
+    manifestPath?: string;
   }): Promise<ReleasePullRequest | undefined> {
     if (await this.needsSnapshot(commits, latestRelease)) {
       this.logger.info('Repository needs a snapshot bump.');
@@ -100,6 +102,7 @@ export class Java extends BaseStrategy {
       latestRelease,
       draft,
       labels,
+      manifestPath,
     });
   }
 

test/manifest.ts

@@ -2494,13 +2494,67 @@ describe('Manifest', () => {
             })
           )
         )
+        .withArgs(
+          '.release-please-manifest.json',
+          'release-please--branches--main--changes--next--components--pkg1'
+        )
+        .resolves(
+          buildGitHubFileRaw(
+            JSON.stringify({
+              'path/a': '1.0.1',
+            })
+          )
+        )
+        .withArgs(
+          '.release-please-manifest.json',
+          'release-please--branches--main--changes--next--components--pkg2'
+        )
+        .resolves(
+          buildGitHubFileRaw(
+            JSON.stringify({
+              'path/b': '2.0.1',
+            })
+          )
+        )
         .withArgs('path/b/package.json', 'next')
         .resolves(
           buildGitHubFileRaw(
             JSON.stringify({
               name: 'pkg2',
             })
           )
+        )
+        .withArgs(
+          '.release-please-manifest.json',
+          'release-please--branches--main--changes--next--components--pkg3'
+        )
+        .resolves(
+          buildGitHubFileRaw(
+            JSON.stringify({
+              'path/c': '3.0.1',
+            })
+          )
+        )
+        .withArgs('path/c/setup.py', 'next')
+        .resolves(
+          buildGitHubFileRaw(
+            `
+name = "pkg3"
+description = "Something"
+version = "3.0.0"
+`
+          )
+        )
+        .withArgs(
+          '.release-please-manifest.json',
+          'release-please--branches--main--changes--next--components--pkg4'
+        )
+        .resolves(
+          buildGitHubFileRaw(
+            JSON.stringify({
+              'path/d': '4.0.1',
+            })
+          )
         );
 
       const findFilesByFilenameAndRefStub = sandbox
@@ -2535,7 +2589,7 @@ describe('Manifest', () => {
       const pullRequests = await manifest.buildPullRequests(
         [
           {
-            title: 'chore(main): release v6.7.9-alpha.1', // version from title differs from expected 4.0.1
+            title: 'chore(main): release v6.7.9-alpha.1', // version from title differs from PR manifest
             body: 'some content',
             headBranchName:
               'release-please--branches--main--changes--next--components--pkg1',
@@ -2545,7 +2599,7 @@ describe('Manifest', () => {
             files: [],
           },
           {
-            title: 'chore(main): release v7.8.9', // version from title differs from expected 4.0.1
+            title: 'chore(main): release v7.8.9', // version from title differs from PR manifest
             body: 'some content',
             headBranchName:
               'release-please--branches--main--changes--next--components--pkg2',
@@ -2555,7 +2609,7 @@ describe('Manifest', () => {
             files: [],
           },
           {
-            title: 'chore(main): release 8.9.0', // version from title differs from expected 4.0.1
+            title: 'chore(main): release 8.9.0', // version from title differs from PR manifest
             body: 'some content',
             headBranchName:
               'release-please--branches--main--changes--next--components--pkg3',
@@ -2565,7 +2619,7 @@ describe('Manifest', () => {
             files: [],
           },
           {
-            title: 'chore(main): release v9.0.1', // version from title differs from expected 4.0.1
+            title: 'chore(main): release v9.0.1', // version from title differs from PR manifest
             body: 'some content',
             headBranchName:
               'release-please--branches--main--changes--next--components--pkg4',
@@ -2582,9 +2636,9 @@ describe('Manifest', () => {
       expect(pullRequests[1].version?.toString()).to.eql('7.8.9');
       expect(pullRequests[2].version?.toString()).to.eql('8.9.0');
       expect(pullRequests[3].version?.toString()).to.eql('9.0.1');
+      sinon.assert.called(getFileContentsOnBranchStub);
       sinon.assert.called(addIssueLabelsStub);
       sinon.assert.called(findFilesByFilenameAndRefStub);
-      sinon.assert.called(getFileContentsOnBranchStub);
       expect(commentCount).to.eql(4);
     });