diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-10-20 11:04:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-20 11:04:15 +0200 |
| commit | 5285c78bc99c8f97cb85b113638259b80b269ae2 (patch) | |
| tree | a0b286886fd54ec03a4021718ef8e0a987b82f99 | |
| parent | 3a42a58cdcb682b0bfe40a009345b2a26c42ab66 (diff) | |
| parent | add809d678b571ae73bdc1835e3b34673746bcde (diff) | |
| download | vyos-1x-5285c78bc99c8f97cb85b113638259b80b269ae2.tar.gz vyos-1x-5285c78bc99c8f97cb85b113638259b80b269ae2.zip | |
Merge pull request #45 from kumvijaya/current
T7878: conflict check updated to use mergify
| -rw-r--r-- | .github/mergify.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/check-open-prs-conflict.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 3 |
3 files changed, 12 insertions, 18 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-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml deleted file mode 100644 index 52b11938e..000000000 --- a/.github/workflows/check-open-prs-conflict.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: "Open PRs Conflicts checker" -on: - push: - branches: - - current - - sagitta - - circinus - workflow_dispatch: - -permissions: - contents: read - pull-requests: write - -jobs: - check-pr-conflict-call: - uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current - secrets: inherit 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 |