summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-04-03 12:55:10 +0200
committerChristian Poessinger <christian@poessinger.com>2022-04-03 12:55:10 +0200
commit035bc9588d319ef8db434fb06caaad2df8eb2a19 (patch)
tree851e4597f3581ff27b4a53092bd85e5089948bcf
parentadda3d86080bb3b8fe26424c7d829e40eb9e2b23 (diff)
downloadvyos-1x-035bc9588d319ef8db434fb06caaad2df8eb2a19.tar.gz
vyos-1x-035bc9588d319ef8db434fb06caaad2df8eb2a19.zip
GitHub: enable PR conflict workflow - backport from current
-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..72ff3969b
--- /dev/null
+++ b/.github/workflows/pr-conflicts.yml
@@ -0,0 +1,18 @@
+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."