summaryrefslogtreecommitdiff
path: root/.github/workflows/pr-conflicts.yml
diff options
context:
space:
mode:
authorVijayakumar A <36878324+kumvijaya@users.noreply.github.com>2024-05-09 12:40:51 +0530
committerGitHub <noreply@github.com>2024-05-09 12:40:51 +0530
commitaab7a7122a70f7fe7cafcabdc7ca5a8125f84939 (patch)
treeb5dfbdb71765812f89fbf105bc8037a3ad485cb8 /.github/workflows/pr-conflicts.yml
parent9b632d47ee6c54da9bfccf87b32fb281380dd356 (diff)
parentd8bc71a13f19258270364dc7b3d54fb7c52a67b7 (diff)
downloadvyos-github-actions-current.tar.gz
vyos-github-actions-current.zip
Merge pull request #2 from vyos/feature/add-codeql-workflowHEADcurrent
T6315: added codeql reusable workflow
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 0000000..2fd0bb4
--- /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-latest
+ steps:
+ - name: check if PRs are dirty
+ uses: eps1lon/actions-label-merge-conflict@v3
+ 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."