summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorkumvijaya <kumvijaya@gmail.com>2025-09-24 22:50:29 +0530
committerkumvijaya <kumvijaya@gmail.com>2025-09-24 22:50:29 +0530
commit1c02b74d680d40373df152d4302b4387db874b0f (patch)
treefd3a78254592026b13f54883dd624b23a2a935b3 /.github/workflows
parentd222f1accd6d6a5bda92dd570c2761ad5a343f45 (diff)
downloadvyos-1x-1c02b74d680d40373df152d4302b4387db874b0f.tar.gz
vyos-1x-1c02b74d680d40373df152d4302b4387db874b0f.zip
T7748: using mergify rule to handle conflict checks for private repo
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/check-pr-conflicts.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index f09e66415..9b0b97423 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -9,6 +9,7 @@ permissions:
contents: read
jobs:
- check-pr-conflict-call:
+ check-pr-conflict:
+ if: github.repository_owner == 'vyos'
uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
secrets: inherit