diff options
| author | kumvijaya <kumvijaya@gmail.com> | 2025-10-18 22:22:00 +0530 |
|---|---|---|
| committer | kumvijaya <kumvijaya@gmail.com> | 2025-10-18 22:22:00 +0530 |
| commit | 8a1b124b3357ed45ba42936386afd0ad10c0e908 (patch) | |
| tree | 3bc561c2e39cdaeb2e69608f7346558ae70196aa | |
| parent | 3a42a58cdcb682b0bfe40a009345b2a26c42ab66 (diff) | |
| download | vyos-1x-8a1b124b3357ed45ba42936386afd0ad10c0e908.tar.gz vyos-1x-8a1b124b3357ed45ba42936386afd0ad10c0e908.zip | |
T7878: conflict check updated to use mergify
| -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..8733cfcad --- /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: + - conflicts diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml index 5417fbb4a..5bf1c106e 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -8,7 +8,8 @@ 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 |