T7878: Using mergify rule to handle conflict checks for private repo

This commit is contained in:
kumvijaya 2025-09-27 23:44:56 +05:30
parent 137b20e425
commit 46d99f7df6
2 changed files with 12 additions and 1 deletions

10
.github/mergify.yml vendored Normal file
View File

@ -0,0 +1,10 @@
pull_request_rules:
- name: Label conflicting pull requests
description: Add a label to a pull request with conflict to spot it easily
conditions:
- conflict
- '-closed'
actions:
label:
toggle:
- conflict

View File

@ -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