summaryrefslogtreecommitdiff
path: root/.github/workflows/pr-conflicts.yml
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-12 21:47:37 +0200
committerChristian Poessinger <christian@poessinger.com>2021-06-12 21:47:37 +0200
commit24fcb422ea2d7e31e4c8864a097e12580a0df266 (patch)
treeb632ccd115f160a3dbe1f8bb72c58e178e849b0c /.github/workflows/pr-conflicts.yml
parent5ebf254316ee88b930685e8091f83ca6b2e12c97 (diff)
downloadvyos-documentation-24fcb422ea2d7e31e4c8864a097e12580a0df266.tar.gz
vyos-documentation-24fcb422ea2d7e31e4c8864a097e12580a0df266.zip
GitHub: add workflows for PR triage and merge conflicts
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."
+