diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-09-25 12:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-25 12:25:46 +0100 |
| commit | d786c09cee0341c324756632df5ce55cf2606cf8 (patch) | |
| tree | 2588ebbd9c639802143064bb25ec0af62c348cb6 | |
| parent | d1cb970352f4bbbd38c69a98df3dfb6c63190587 (diff) | |
| parent | b10133f5bdc644420866018e2795e07522578785 (diff) | |
| download | vyos-1x-d786c09cee0341c324756632df5ce55cf2606cf8.tar.gz vyos-1x-d786c09cee0341c324756632df5ce55cf2606cf8.zip | |
Merge pull request #4751 from kumvijaya/current
T7748: Using mergify rule to handle conflict checks for private repo
| -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 |