Detect PRs that have a conflict, now with comments

Signed-off-by: Fred Bricon <fbricon@gmail.com>
redhat-developer · Jul 16, 2020 · 239d484 · 239d484
1 parent 8c895af
commit 239d484
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/.github/workflows/conflictDetector.yaml b/.github/workflows/conflictDetector.yaml
@@ -2,11 +2,15 @@ on:
   push:
     branches:
       - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+
 jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
+      - uses: Marr11317/ConflictAdviser@v1
         with:
-          CONFLICT_LABEL_NAME: "has conflicts"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          conflict_label: "has conflicts"
+          comment: 'Merge conflicts detected!'