summaryrefslogtreecommitdiff
path: root/.github/workflows/pr-conflicts.yml
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-12 13:19:02 +0200
committerChristian Poessinger <christian@poessinger.com>2021-06-12 13:19:02 +0200
commit5cf4c64207b6526092e623476953044609b94c6c (patch)
tree4d917d1dd5fb1de557ac4f617423b98e31676bfd /.github/workflows/pr-conflicts.yml
parent550cea8e88f11564abb4691354ecbac22d146a29 (diff)
downloadvyos-1x-5cf4c64207b6526092e623476953044609b94c6c.tar.gz
vyos-1x-5cf4c64207b6526092e623476953044609b94c6c.zip
GitHub: add workflow to check for PR conflicts
Diffstat (limited to '.github/workflows/pr-conflicts.yml')
-rw-r--r--.github/workflows/pr-conflicts.yml18
1 files changed, 18 insertions, 0 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml
new file mode 100644
index 000000000..f7084346c
--- /dev/null
+++ b/.github/workflows/pr-conflicts.yml
@@ -0,0 +1,18 @@
+ame: "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."