vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1047 from kumvijaya/current

Browse Source 
T7878: Using mergify rule to handle conflict checks for private repo
This commit is contained in:
Vijayakumar A 2025-09-30 00:13:26 +05:30 committed by GitHub
commit 3f36fe9466
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

3
.github/workflows/check-pr-conflicts.yml vendored
View File

@ -9,6 +9,7 @@ permissions:
contents: read contents: read
jobs: jobs:
check-pr-conflict-call: check-pr-conflict:
if: github.repository_owner == 'vyos'
uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
secrets: inherit secrets: inherit