Filter by commitish regardless of the refs/heads prefix

release-drafter · Feb 28, 2022 · dc24635 · dc24635
1 parent d8ca1fa
commit dc24635
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -129086,8 +129086,14 @@ const findReleases = async ({
 
   log({ context, message: `Found ${releases.length} releases` })
 
+  // `refs/heads/branch` and `branch` are the same thing in this context
+  const headRefRegex = /^refs\/heads\//
+  const targetCommitishName = targetCommitish.replace(headRefRegex, '')
   const filteredReleases = filterByCommitish
-    ? releases.filter((r) => targetCommitish.match(`/${r.target_commitish}$`))
+    ? releases.filter(
+        (r) =>
+          targetCommitishName === r.target_commitish.replace(headRefRegex, '')
+      )
     : releases
   const sortedPublishedReleases = sortReleases(
     filteredReleases.filter((r) => !r.draft)

diff --git a/lib/releases.js b/lib/releases.js
@@ -43,8 +43,14 @@ const findReleases = async ({
 
   log({ context, message: `Found ${releases.length} releases` })
 
+  // `refs/heads/branch` and `branch` are the same thing in this context
+  const headRefRegex = /^refs\/heads\//
+  const targetCommitishName = targetCommitish.replace(headRefRegex, '')
   const filteredReleases = filterByCommitish
-    ? releases.filter((r) => targetCommitish.match(`/${r.target_commitish}$`))
+    ? releases.filter(
+        (r) =>
+          targetCommitishName === r.target_commitish.replace(headRefRegex, '')
+      )
     : releases
   const sortedPublishedReleases = sortReleases(
     filteredReleases.filter((r) => !r.draft)