Skip to content

Commit

Permalink
ci: add a workflow to tag PR with merge conflicts
Browse files Browse the repository at this point in the history
This will allow the PR author to be notified and resolve merge conflicts as soon as they arrive
  • Loading branch information
sharevb committed Sep 4, 2024
1 parent 318fb6e commit fde7035
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/pr-conflicts-tagger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: "Pull Requests Merge Conflicts Tagger"
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 dirty
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "PR: needs rebase"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
# commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."

0 comments on commit fde7035

Please sign in to comment.