only run merge conflict action on pushes to master

Running against all pushes is pointless because only pushes to master will create merge conflicts.
andrewmcodes · May 7, 2020 · 626057b · 626057b
1 parent 554e8c4
commit 626057b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/label_approved_pull_requests.yml b/.github/workflows/label_approved_pull_requests.yml
@@ -1,5 +1,7 @@
-on: pull_request_review
 name: Label approved pull requests
+
+on: pull_request_review
+
 jobs:
   labelWhenApproved:
     name: Label when approved

diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
@@ -3,7 +3,7 @@ name: Check for merge conflicts
 on:
   push:
     branches:
-      - '*'
+      - master
 
 jobs:
   triage:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Check for merge conflicts @@
     on:
       push:
         branches:
-          - '*'
+          - master
     jobs:
       triage:
@@ Expand Down @@