Skip to content

Commit 6eec061

Browse files
committed
GH Actions: update merge conflict check workflow
The `mschilde/auto-label-merge-conflicts` action runner is not actively maintained and is currently failing due to an unhandled deprecation notice. [Example](https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/runs/9380398878/job/25827454084) I've evaluated the action runners available for this kind of thing and am proposing to switch to the `eps1lon/actions-label-merge-conflict` action runner, which should be a one-on-one replacement for the currently used functionality. Additionally, that action has an option to post a comment when a conflict is detected as well as when the conflict has been resolved. While not currently used, this feature might be useful in the future. Note: unfortunately, I won't be able to test the change until merged into the `master` branch, so this may need further tweaks once merged. Refs: * https://github.com/marketplace?query=label+merge+conflicts * https://github.com/mschilde/auto-label-merge-conflicts * https://github.com/eps1lon/actions-label-merge-conflict
1 parent 40298d9 commit 6eec061

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/label-merge-conflicts.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
name: Check PRs for merge conflicts
2121

2222
steps:
23-
- uses: mschilde/auto-label-merge-conflicts@master
23+
- name: Check PRs for merge conflicts
24+
uses: eps1lon/actions-label-merge-conflict@v3
2425
with:
25-
CONFLICT_LABEL_NAME: "Status: has merge conflict"
26-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
dirtyLabel: "Status: has merge conflict"
27+
repoToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)