Merge pull request #97 from KeisukeYamashita/test-complicated-cases

Add complicated test case
KeisukeYamashita · Jan 16, 2021 · 93f2465 · 93f2465
2 parents 6613b10 + 8e0de2f
commit 93f2465
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -12,6 +12,7 @@ jobs:
           intervalSeconds: 1
           timeoutSeconds: 60
           labels: need,need2
+          labelsStrategy: atLeastOne
           ignoreLabels: ignore
       - name: Create Comment
         uses: KeisukeYamashita/create-comment@v1

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/merger.ts b/src/merger.ts
@@ -62,7 +62,7 @@ export class Merger {
     }
 
     core.debug(
-      `checked all labels for type:${type} and prLabels:${inspect(
+      `Checking all labels for type:${type} and prLabels:${inspect(
         pr.labels.map(l => l.name)
       )}, hasLabels:${inspect(hasLabels)}, labels:${inspect(
         labels
@@ -75,7 +75,7 @@ export class Merger {
         type === 'labels' ? '' : "does't"
       } contains all ${inspect(labels)} for PR labels ${inspect(
         pr.labels.map(l => l.name)
-      )}`
+      )} and and failed: ${failed}`
     }
   }
 
@@ -94,12 +94,12 @@ export class Merger {
     if (type === 'labels' && hasLabels.length) {
       failed = false
     }
-    if (type === 'ignoreLabels' && hasLabels.length) {
+    if (type === 'ignoreLabels' && !hasLabels.length) {
       failed = false
     }
 
     core.debug(
-      `checked all labels for type:${type} and prLabels:${inspect(
+      `Checking atLeastOne labels for type:${type} and prLabels:${inspect(
         pr.labels.map(l => l.name)
       )}, hasLabels:${inspect(hasLabels)}, labels:${inspect(
         labels
@@ -160,7 +160,7 @@ export class Merger {
                 `Checked labels and passed with message:${labelResult.message} with ${this.cfg.labelsStrategy}`
               )
               core.info(
-                `Checked labels and passed with ignoreLabels:${inspect(
+                `Checked labels and passed with labels:${inspect(
                   this.cfg.labels
                 )}`
               )