summaryrefslogtreecommitdiff
path: root/.github/workflows/pr-conflicts.yml
diff options
context:
space:
mode:
Diffstat (limited to '.github/workflows/pr-conflicts.yml')
-rw-r--r--.github/workflows/pr-conflicts.yml19
1 files changed, 19 insertions, 0 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml
new file mode 100644
index 00000000..87bc8c9f
--- /dev/null
+++ b/.github/workflows/pr-conflicts.yml
@@ -0,0 +1,19 @@
+name: "PR Conflicts checker"
+on:
+ pull_request_target:
+ types: [synchronize]
+
+jobs:
+ Conflict_Check:
+ name: 'Check PR status: conflicts and resolution'
+ runs-on: ubuntu-18.04
+ steps:
+ - name: check if PRs are dirty
+ uses: eps1lon/actions-label-merge-conflict@releases/2.x
+ with:
+ dirtyLabel: "state: conflict"
+ removeOnDirtyLabel: "state: conflict resolved"
+ 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."
+