summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVijayakumar A <36878324+kumvijaya@users.noreply.github.com>2025-05-26 19:50:50 +0530
committerGitHub <noreply@github.com>2025-05-26 15:20:50 +0100
commit86a282ecd049ce4aa25e5fd7b776423f96d7ce9c (patch)
treea07671105e9d9a26385f1369909aaae2bd337145
parent60b8d8d64e758a5aebb5e7c7983ed129a804a088 (diff)
downloadvyos-documentation-86a282ecd049ce4aa25e5fd7b776423f96d7ce9c.tar.gz
vyos-documentation-86a282ecd049ce4aa25e5fd7b776423f96d7ce9c.zip
T7445: added open prs conflict check caller workflow (#1638)
Co-authored-by: kumvijaya <kuvmijaya@gmail.com>
-rw-r--r--.github/workflows/check-open-prs-conflict.yml17
-rw-r--r--.github/workflows/check-pr-conflicts.yml2
2 files changed, 18 insertions, 1 deletions
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml
new file mode 100644
index 00000000..52b11938
--- /dev/null
+++ b/.github/workflows/check-open-prs-conflict.yml
@@ -0,0 +1,17 @@
+name: "Open PRs Conflicts checker"
+on:
+ push:
+ branches:
+ - current
+ - sagitta
+ - circinus
+ workflow_dispatch:
+
+permissions:
+ contents: read
+ pull-requests: write
+
+jobs:
+ check-pr-conflict-call:
+ uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current
+ secrets: inherit
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index 0c659e6e..f09e6641 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -10,5 +10,5 @@ permissions:
jobs:
check-pr-conflict-call:
- uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
+ uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
secrets: inherit