fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-25 19:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Post comment when PR has a merge conflict

Browse Source 
Switch out the action with another one that actually supports posting
comments :^)
This commit is contained in:
Jelle Raaijmakers
2024-12-17 14:53:42 +01:00
committed by Tim Flynn
parent 25e05e76c4
commit 03aafda788
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/merge-conflict-labeler.yml vendored
View File

@@ -17,9 +17,12 @@ jobs:
contents: read contents: read
pull-requests: write pull-requests: write
steps: steps:
- uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd - uses: eps1lon/actions-label-merge-conflict@v3
with: with:
CONFLICT_LABEL_NAME: 'conflicts' commentOnDirty: >
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} Your pull request has conflicts that need to be resolved before it can be reviewed and merged. Make sure to
MAX_RETRIES: 3 [rebase](https://www.youtube.com/watch?v=ElRzTuYln0M) your branch on top of the latest `master`.
WAIT_MS: 15000 dirtyLabel: 'conflicts'
repoToken: ${{ secrets.GITHUB_TOKEN }}
retryAfter: 15
retryMax: 3