Update workflow

Signed-off-by: KeisukeYamashita <[email protected]>

.github/workflows/auto-merge.yml

@@ -7,7 +7,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ./
+        id: merge
         with:
           intervalSeconds: 1
           timeoutSeconds: 30
           ignoreLabels: 'ignore'
+      - name: Create Comment
+        uses: KeisukeYamashita/create-comment@v1
+        with:
+          comment: ${{ steps.merge.outputs.merged }}

README.md

@@ -38,6 +38,7 @@ jobs:
 | --- | --- | --- |
 | `checkStatus` | Check all status before merge' | `true` |
 | `comment` | Comments to post before merging the pull request | - |
+| `dryRun` | Dry run the merge or not | `false` |
 | `failStep` | Fail the step if no PR has merged | `true` |  
 | `ignoreLabels` | Label that the target pull request shouldn't have | - |
 | `ignoreLabelsStrategy` | Check condition on how to check the labels (Options are `all`, `atLeastOne`). | `all` |

action.yml

@@ -10,6 +10,10 @@ inputs:
     required: false
     description: 'Comment before merge'
     default: ''
+  dryRun:
+    required: false
+    description: 'Dry run'
+    default: 'false'
   intervalSeconds:
     required: false
     description: 'Seconds between the check'

src/main.ts

@@ -9,6 +9,7 @@ async function run(): Promise<void> {
     const inputs: Inputs = {
       checkStatus: core.getInput('checkStatus') === 'true',
       comment: core.getInput('comment'),
+      dryRun: core.getInput('dryRun') === 'true',
       ignoreLabels:
         core.getInput('ignoreLabels') === ''
           ? []

src/merger.ts

@@ -9,6 +9,7 @@ export type labelStrategies = 'all' | 'atLeastOne'
 export interface Inputs {
   checkStatus: boolean
   comment: string
+  dryRun: boolean
   ignoreLabels: string[]
   ignoreLabelsStrategy: labelStrategies
   failStep: boolean
@@ -27,7 +28,7 @@ export interface Inputs {
 export type Strategy = 'merge' | 'squash' | 'rebase'
 
 interface ValidationResult {
-  status: boolean
+  failed: boolean
   message: string
 }
 
@@ -52,16 +53,16 @@ export class Merger {
       })
       .map(label => label.name)
 
-    let status = true
+    let failed = true
     if (type === 'labels' && hasLabels.length === labels.length) {
-      status = false
+      failed = false
     }
-    if (type === 'ignoreLabels' && hasLabels.length) {
-      status = false
+    if (type === 'ignoreLabels' && !hasLabels.length) {
+      failed = false
     }
 
     return {
-      status,
+      failed,
       message: `PR ${pr.id} ${
         type === 'ignoreLabels' ? "does't" : ''
       } contains all ${inspect(labels)}`
@@ -79,19 +80,19 @@ export class Merger {
       })
       .map(label => label.name)
 
-    let status = true
+    let failed = true
     if (type === 'labels' && hasLabels.length) {
-      status = false
+      failed = false
     }
     if (type === 'ignoreLabels' && hasLabels.length) {
-      status = false
+      failed = false
     }
 
     return {
-      status,
+      failed,
       message: `PR ${pr.id} ${
         type === 'ignoreLabels' ? "does't" : ''
-      } contains ${labels}`
+      } contains ${inspect(labels)}`
     }
   }
 
@@ -131,7 +132,7 @@ export class Merger {
                 this.cfg.labelsStrategy,
                 'labels'
               )
-              if (!labelResult.status) {
+              if (labelResult.failed) {
                 throw new Error(labelResult.message)
               }
 
@@ -147,7 +148,7 @@ export class Merger {
                 this.cfg.ignoreLabelsStrategy,
                 'ignoreLabels'
               )
-              if (!ignoreLabelResult.status) {
+              if (ignoreLabelResult.failed) {
                 throw new Error(ignoreLabelResult.message)
               }
 
@@ -200,13 +201,17 @@ export class Merger {
         core.setOutput(`commentID`, resp.id)
       }
 
-      await client.pulls.merge({
-        owner,
-        repo,
-        pull_number: this.cfg.pullRequestNumber,
-        merge_method: this.cfg.strategy
-      })
-      core.setOutput('merged', true)
+      if (!this.cfg.dryRun) {
+        await client.pulls.merge({
+          owner,
+          repo,
+          pull_number: this.cfg.pullRequestNumber,
+          merge_method: this.cfg.strategy
+        })
+        core.setOutput('merged', true)
+      } else {
+        core.setOutput('merged', false)
+      }
     } catch (err) {
       core.debug(`Error on retry error:${inspect(err)}`)
       if (this.cfg.failStep) {