fix: prevent open release PRs from being mistaken as current releases

googleapis · Aug 15, 2024 · 1c1e48b · 1c1e48b
1 parent f3b87f2
commit 1c1e48b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/__snapshots__/github.js b/__snapshots__/github.js
diff --git a/src/github.ts b/src/github.ts
@@ -510,6 +510,7 @@ export class GitHub {
           number: pullRequest.number,
           baseBranchName: pullRequest.baseRefName,
           headBranchName: pullRequest.headRefName,
+          mergeCommitOid: pullRequest.mergeCommit?.oid,
           title: pullRequest.title,
           body: pullRequest.body,
           labels: pullRequest.labels.nodes.map(node => node.name),

diff --git a/src/manifest.ts b/src/manifest.ts
@@ -1571,7 +1571,7 @@ async function latestReleaseVersion(
   for await (const commitWithPullRequest of generator) {
     commitShas.add(commitWithPullRequest.sha);
     const mergedPullRequest = commitWithPullRequest.pullRequest;
-    if (!mergedPullRequest) {
+    if (!mergedPullRequest?.mergeCommitOid) {
       logger.trace(
         `skipping commit: ${commitWithPullRequest.sha} missing merged pull request`
       );

diff --git a/src/pull-request.ts b/src/pull-request.ts
@@ -16,6 +16,7 @@ export interface PullRequest {
   readonly headBranchName: string;
   readonly baseBranchName: string;
   readonly number: number;
+  readonly mergeCommitOid?: string;
   readonly title: string;
   readonly body: string;
   readonly labels: string[];

diff --git a/test/manifest.ts b/test/manifest.ts
@@ -1423,6 +1423,7 @@ describe('Manifest', () => {
             title: 'chore: release 1.2.3',
             headBranchName: 'release-please/branches/main',
             baseBranchName: 'main',
+            mergeCommitOid: 'abc123',
             number: 123,
             body: '',
             labels: [],