diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/mergify.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 000000000..985cf0981 --- /dev/null +++ b/.github/mergify.yml @@ -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 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 |