Merge pull request #1 from MariuszKogut/Fix824

Use commitish from action inputs. Fixes release-drafter#824.
lanalabs · Jul 21, 2021 · 8f4a03e · 8f4a03e
2 parents 349214e + c0185a0
commit 8f4a03e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -145,6 +145,7 @@ module.exports = (app, { getRouter }) => {
       tag,
       name,
       disableReleaser,
+      commitish,
     } = getInput()
 
     const config = await getConfig({
@@ -195,6 +196,7 @@ module.exports = (app, { getRouter }) => {
       name,
       isPreRelease,
       shouldDraft,
+      commitish,
     })
 
     let createOrUpdateReleaseResponse
@@ -234,6 +236,7 @@ function getInput({ config } = {}) {
         core.getInput('disable-releaser').toLowerCase() === 'true',
       disableAutolabeler:
         core.getInput('disable-autolabeler').toLowerCase() === 'true',
+      commitish: core.getInput('commitish') || undefined,
     }
   }
 
@@ -814,6 +817,7 @@ module.exports.generateReleaseInfo = ({
   name = undefined,
   isPreRelease,
   shouldDraft,
+  commitish = undefined
 }) => {
   let body = config.template
 
@@ -853,7 +857,9 @@ module.exports.generateReleaseInfo = ({
       : ''
   }
 
-  let commitish = config['commitish'] || ''
+  if (commitish === undefined) {
+    commitish = config['commitish'] || ''
+  }
 
   return {
     name,

diff --git a/index.js b/index.js
@@ -131,6 +131,7 @@ module.exports = (app, { getRouter }) => {
       tag,
       name,
       disableReleaser,
+      commitish,
     } = getInput()
 
     const config = await getConfig({
@@ -181,6 +182,7 @@ module.exports = (app, { getRouter }) => {
       name,
       isPreRelease,
       shouldDraft,
+      commitish,
     })
 
     let createOrUpdateReleaseResponse
@@ -220,6 +222,7 @@ function getInput({ config } = {}) {
         core.getInput('disable-releaser').toLowerCase() === 'true',
       disableAutolabeler:
         core.getInput('disable-autolabeler').toLowerCase() === 'true',
+      commitish: core.getInput('commitish') || undefined,
     }
   }
 

diff --git a/lib/releases.js b/lib/releases.js
@@ -251,6 +251,7 @@ module.exports.generateReleaseInfo = ({
   name = undefined,
   isPreRelease,
   shouldDraft,
+  commitish = undefined,
 }) => {
   let body = config.template
 
@@ -290,7 +291,9 @@ module.exports.generateReleaseInfo = ({
       : ''
   }
 
-  let commitish = config['commitish'] || ''
+  if (commitish === undefined) {
+    commitish = config['commitish'] || ''
+  }
 
   return {
     name,