Merge pull request #24 from KeisukeYamashita/rebuild-action

Rebuild the action for v1 release

README.md

@@ -50,7 +50,9 @@ jobs:
 
 ### Action outputs
 
-Nothing.
+| Name | Description | 
+| --- | --- | 
+| `commentID` | ID of the comment if you specify `comment` in input | 
 
 ### Disclaimer
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "gotenks-auto-pr-merge",
+  "name": "auto-pull-request-merge",
   "version": "1.0.0",
   "description": "Merge PR automatically",
   "main": "lib/main.js",

src/main.ts

@@ -10,9 +10,9 @@ async function run(): Promise<void> {
       checkStatus: core.getInput('checkStatus') === 'true',
       comment: core.getInput('comment'),
       ignoreLabels:
-        core.getInput('labels') === ''
+        core.getInput('ignoreLabels') === ''
           ? []
-          : core.getInput('labels').split(','),
+          : core.getInput('ignoreLabels').split(','),
       failStep: core.getInput('failStep') === 'true',
       intervalSeconds: Number(core.getInput('intervalSeconds')) * 1000,
       labels:

src/merger.ts

@@ -52,14 +52,21 @@ export class Merger {
                   `Needed Label not included in this pull request`
                 )
               }
+              core.debug(`Pull request has all need labels`)
 
               if (
-                pr.labels.some(label => this.cfg.labels.includes(label.name))
+                !pr.labels.every(
+                  label => !this.cfg.ignoreLabels.includes(label.name)
+                )
               ) {
                 throw new Error(
-                  `This pull request contains labels that should be ignored`
+                  `This pull request contains labels that should be ignored, labels:${inspect(
+                    pr.labels.map(l => l.name)
+                  )}`
                 )
               }
+
+              core.debug(`Pull request doesn't have ignore labels`)
             }
 
             if (this.cfg.checkStatus) {
@@ -93,14 +100,15 @@ export class Merger {
       )
 
       if (this.cfg.comment) {
-        await client.issues.createComment({
+        const {data: resp} = await client.issues.createComment({
           owner: this.cfg.owner,
           repo: this.cfg.repo,
           issue_number: this.cfg.pullRequestNumber,
           body: this.cfg.comment
         })
 
         core.debug(`Post comment ${inspect(this.cfg.comment)}`)
+        core.setOutput(`commentID`, resp.id)
       }
 
       await client.pulls.merge({