Skip to content

Commit 46d99f7

Browse files
committed
T7878: Using mergify rule to handle conflict checks for private repo
1 parent 137b20e commit 46d99f7

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

.github/mergify.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
pull_request_rules:
2+
- name: Label conflicting pull requests
3+
description: Add a label to a pull request with conflict to spot it easily
4+
conditions:
5+
- conflict
6+
- '-closed'
7+
actions:
8+
label:
9+
toggle:
10+
- conflict

.github/workflows/check-pr-conflicts.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ permissions:
99
contents: read
1010

1111
jobs:
12-
check-pr-conflict-call:
12+
check-pr-conflict:
13+
if: github.repository_owner == 'vyos'
1314
uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
1415
secrets: inherit

0 commit comments

Comments
 (0)