mirror of
https://github.com/fergalmoran/ladybird.git
synced 2025-12-22 09:19:03 +00:00
CI: Post comment when PR has a merge conflict
Switch out the action with another one that actually supports posting comments :^)
This commit is contained in:
committed by
Tim Flynn
parent
25e05e76c4
commit
03aafda788
13
.github/workflows/merge-conflict-labeler.yml
vendored
13
.github/workflows/merge-conflict-labeler.yml
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user