fix: closing of previous release PRs (#31)

ExodusMovement · Jan 26, 2024 · e0a52a4 · e0a52a4
1 parent e8fc99b
commit e0a52a4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/dist/publish/index.js b/dist/publish/index.js
diff --git a/dist/publish/index.js.map b/dist/publish/index.js.map
diff --git a/dist/version/index.js b/dist/version/index.js
diff --git a/dist/version/index.js.map b/dist/version/index.js.map
diff --git a/src/utils/github.ts b/src/utils/github.ts
@@ -179,9 +179,7 @@ export async function getPullRequestsForLabels({
     { search }
   )
 
-  return response.search.edges
-    .map((edge) => edge.node)
-    .filter((pr) => pr.labels.nodes.every((label) => labels.includes(label.name)))
+  return response.search.edges.map((edge) => edge.node)
 }
 
 type ClosePullRequestParams = {

diff --git a/src/version/close-previous-prs.ts b/src/version/close-previous-prs.ts
@@ -9,6 +9,7 @@ import { RELEASE_PR_LABEL } from '../constants'
 import * as path from 'path'
 import { Repo } from '../utils/types'
 import * as core from '@actions/core'
+import { getPackagePaths } from '@exodus/lerna-utils'
 
 type Params = {
   client: GithubClient
@@ -18,9 +19,18 @@ type Params = {
 }
 
 export default async function closePreviousPrs({ client, repo, pullRequest, packages }: Params) {
+  const allPackages = await getPackagePaths()
+  const allPackageNames = new Set(allPackages.map((it) => path.basename(it)))
   const labels = [RELEASE_PR_LABEL, ...packages.map((it) => path.basename(it))]
   const previousPrs = await getPullRequestsForLabels({ client, repo, labels })
-  const filtered = previousPrs.filter((pr) => pr.number !== pullRequest.number)
+
+  const filtered = previousPrs.filter(
+    (pr) =>
+      pr.number !== pullRequest.number &&
+      pr.labels.nodes.every(
+        (label) => labels.includes(label.name) || !allPackageNames.has(label.name)
+      )
+  )
 
   if (filtered.length === 0) {
     core.info('Found no previous PRs releasing the same packages.')