2022-12-12 21:26:50 +00:00
|
|
|
name: "Check for merge conflicts"
|
|
|
|
|
on:
|
|
|
|
|
# So that PRs touching the same files as the push are updated
|
|
|
|
|
push:
|
|
|
|
|
# So that the `dirtyLabel` is removed if conflicts are resolve
|
|
|
|
|
# We recommend `pull_request_target` so that github secrets are available.
|
|
|
|
|
# In `pull_request` we wouldn't be able to change labels of fork PRs
|
|
|
|
|
pull_request_target:
|
|
|
|
|
types: [synchronize]
|
|
|
|
|
|
|
|
|
|
jobs:
|
|
|
|
|
main:
|
|
|
|
|
runs-on: ubuntu-latest
|
|
|
|
|
steps:
|
|
|
|
|
- name: Check if PRs are have merge conflicts
|
2024-03-30 10:50:22 +00:00
|
|
|
uses: eps1lon/actions-label-merge-conflict@v3.0.0
|
2022-12-12 21:26:50 +00:00
|
|
|
with:
|
|
|
|
|
dirtyLabel: "PR: Merge Conflict"
|
|
|
|
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
|
|
|
|
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
|
2022-12-22 21:27:03 +00:00
|
|
|
commentOnClean: "Conflicts have been resolved."
|
