Merge pull request #519 from PHPCSStandards/feature/ghaction-fix-merg…

…e-conflict-status-workflow GH Actions: update merge conflict check workflow
PHPCSStandards · Jun 5, 2024 · a6b0baf · a6b0baf
2 parents 1114d35 + dafe115
commit a6b0baf
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml
@@ -20,7 +20,8 @@ jobs:
     name: Check PRs for merge conflicts
 
     steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
+      - name: Check PRs for merge conflicts
+        uses: eps1lon/actions-label-merge-conflict@v3
         with:
-          CONFLICT_LABEL_NAME: "Status: has merge conflict"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          dirtyLabel: "Status: has merge conflict"
+          repoToken: ${{ secrets.GITHUB_TOKEN }}