Fix trigger rule (#20)

* Fix typo * Fix trigger rule
abema · Dec 28, 2021 · 3f17d70 · 3f17d70
1 parent 7f08958
commit 3f17d70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/github-actions-merger.yaml b/.github/workflows/github-actions-merger.yaml
@@ -1,14 +1,15 @@
 name: merge
+
 on: 
   issue_comment:
     types: [created, edited]
 
 jobs:
   merge:
-    if: ${{ github.event.issue.pull_request }} && github.event.review.state == 'approved'
+    if: ${{ (github.event.issue.pull_request) && (github.event.comment.body == '/merge') }}
     runs-on: ubuntu-latest
     steps:
-      - name: labelcommit
+      - name: Create merge commit with labels
         uses: abema/github-actions-merger@main
         with: 
           "github_token": ${{ secrets.GITHUB_TOKEN }}

diff --git a/main.go b/main.go
@@ -64,7 +64,7 @@ func validateEnv(e env) error {
 	}
 	for _, m := range e.Mergers {
 		if e.Actor == m {
-			// if actor mathes specified mergers, then valid workflow run.
+			// if actor matches specified mergers, then valid workflow run.
 			return nil
 		}
 	}