ensure PRs are merged (#1015)

release-drafter · Jan 16, 2022 · d51d5d1 · d51d5d1
1 parent 0bc3bc5
commit d51d5d1
Show file tree

Hide file tree

Showing 12 changed files with 307 additions and 119 deletions.
diff --git a/bin/generate-fixtures.js b/bin/generate-fixtures.js
@@ -3,7 +3,9 @@
 const fs = require('fs')
 const path = require('path')
 const fetch = require('node-fetch')
+const dotenv = require('dotenv')
 const { findCommitsWithAssociatedPullRequestsQuery } = require('../lib/commits')
+dotenv.config()
 
 const REPO_NAME = 'release-drafter-test-repo'
 const GITHUB_GRAPHQL_API_ENDPOINT = 'https://api.github.com/graphql'
@@ -53,6 +55,8 @@ for (const repo of repos) {
         ref: repo.branch,
         withPullRequestBody: true,
         withPullRequestURL: true,
+        withBaseRefName: true,
+        withHeadRefName: true,
       },
     }),
   }

diff --git a/dist/index.js b/dist/index.js
@@ -133128,6 +133128,7 @@ const findCommitsWithAssociatedPullRequestsQuery = /* GraphQL */ `
                       name
                     }
                   }
+                  merged
                   baseRefName @include(if: $withBaseRefName)
                   headRefName @include(if: $withHeadRefName)
                 }
@@ -133192,7 +133193,9 @@ const findCommitsWithAssociatedPullRequests = async ({
   const pullRequests = _.uniqBy(
     commits.flatMap((commit) => commit.associatedPullRequests.nodes),
     'number'
-  ).filter((pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner)
+  ).filter(
+    (pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner && pr.merged
+  )
 
   return { commits, pullRequests }
 }

diff --git a/lib/commits.js b/lib/commits.js
@@ -52,6 +52,7 @@ const findCommitsWithAssociatedPullRequestsQuery = /* GraphQL */ `
                       name
                     }
                   }
+                  merged
                   baseRefName @include(if: $withBaseRefName)
                   headRefName @include(if: $withHeadRefName)
                 }
@@ -116,7 +117,9 @@ const findCommitsWithAssociatedPullRequests = async ({
   const pullRequests = _.uniqBy(
     commits.flatMap((commit) => commit.associatedPullRequests.nodes),
     'number'
-  ).filter((pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner)
+  ).filter(
+    (pr) => pr.baseRepository.nameWithOwner === repoNameWithOwner && pr.merged
+  )
 
   return { commits, pullRequests }
 }

diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "mocked-env": "^1.3.5",
     "nock": "13.2.2",
     "nock-knock": "2.0.0",
-    "node-fetch": "3.1.0",
+    "node-fetch": "2.6.7",
     "nodemon": "2.0.15",
     "prettier": "2.5.1",
     "smee-client": "1.2.2"

diff --git a/test/fixtures/__generated__/graphql-commits-forking.json b/test/fixtures/__generated__/graphql-commits-forking.json