Skip to content

Commit

Permalink
CI: Post comment when PR has a merge conflict
Browse files Browse the repository at this point in the history
Switch out the action with another one that actually supports posting
comments :^)
  • Loading branch information
gmta committed Dec 17, 2024
1 parent 25e05e7 commit 044a6bc
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/merge-conflict-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 044a6bc

Please sign in to comment.