summaryrefslogtreecommitdiff
path: root/.github/workflows/pr-conflicts.yml
diff options
context:
space:
mode:
authorVijayakumar A <36878324+kumvijaya@users.noreply.github.com>2024-05-18 08:10:58 +0530
committerGitHub <noreply@github.com>2024-05-18 05:40:58 +0300
commit807791a01f946784a7e192b0e827ec891c112a77 (patch)
tree5ed3070181b69e68b4b94a9ffceab604f99e701e /.github/workflows/pr-conflicts.yml
parent6b70110062190cae48770613d546ab89cb4c4de5 (diff)
downloadvyos-1x-807791a01f946784a7e192b0e827ec891c112a77.tar.gz
vyos-1x-807791a01f946784a7e192b0e827ec891c112a77.zip
T6349: updated conflict check workflow (#3468)
* T6349: updated conflict workflow * T6349: updated conflict workflow * T6349: updated all workflows to use reusable workflows * T6349: updated all workflows to use reusable workflows
Diffstat (limited to '.github/workflows/pr-conflicts.yml')
-rw-r--r--.github/workflows/pr-conflicts.yml18
1 files changed, 0 insertions, 18 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml
deleted file mode 100644
index 2fd0bb42d..000000000
--- a/.github/workflows/pr-conflicts.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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."