CI: Post comment when PR has a merge conflict

Switch out the action with another one that actually supports posting comments :^)
Author: https://github.com/gmta Commit: https://github.com/LadybirdBrowser/ladybird/commit/03aafda788f Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2948 Reviewed-by: https://github.com/AtkinsSJ ✅
2025-04-24 05:25:13 +00:00 · 2024-12-17 14:53:42 +01:00 · 2024-12-17 14:53:42 +01:00 · 03aafda788 · 2024-12-17 15:09:51 +00:00
commit 03aafda788
parent 25e05e76c4
1 changed files with 8 additions and 5 deletions
--- a/.github/workflows/merge-conflict-labeler.yml
+++ b/.github/workflows/merge-conflict-labeler.yml
@ -17,9 +17,12 @@ jobs:
      contents: read
      pull-requests: write
    steps:
-      - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd
+      - uses: eps1lon/actions-label-merge-conflict@v3
        with:
-          CONFLICT_LABEL_NAME: 'conflicts'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MAX_RETRIES: 3
-          WAIT_MS: 15000
+          commentOnDirty: >
+            Your pull request has conflicts that need to be resolved before it can be reviewed and merged. Make sure to
+            [rebase](https://www.youtube.com/watch?v=ElRzTuYln0M) your branch on top of the latest `master`.
+          dirtyLabel: 'conflicts'
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          retryAfter: 15
+          retryMax: 3