diff options
| author | Daniil Baturin <daniil@vyos.io> | 2026-05-14 15:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-14 15:25:46 +0100 |
| commit | cfa01ec4c8597931bb113a2cf1b19bb0a2cb0ee7 (patch) | |
| tree | 0eb78b3fe08a0f39374adf442c2c0b7fae5855c7 | |
| parent | 4d4f5d360e66fd3d5f60a206f95a6b6074ac202b (diff) | |
| parent | 314d9cfe250f8c50121e46e8975cb26dc95985c5 (diff) | |
| download | libnss-mapuser-cfa01ec4c8597931bb113a2cf1b19bb0a2cb0ee7.tar.gz libnss-mapuser-cfa01ec4c8597931bb113a2cf1b19bb0a2cb0ee7.zip | |
Merge pull request #17 from vyos/T8852-mergify-extends
T8852: migrate .github/mergify.yml to extends: mergify
| -rw-r--r-- | .github/mergify.yml | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml index b2cf6ac..6b8c380 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,25 +1,20 @@ -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 +# yaml-language-server: $schema=https://docs.mergify.com/configuration/file-format/ +# Mergify configuration for vyos/libnss-mapuser. +# +# Inherits the central baseline from vyos/mergify:.mergify.yml. The central +# baseline provides: +# - `defaults.actions.backport.ignore_conflicts: false` +# - `pull_request_rules` → label conflicting PRs with `conflicts`; +# T-ID format checks on PR title and commit messages. +# - `commands_restrictions` → restrict @Mergifyio slash commands to the +# org Maintainers team + vyosbot. Resolves correctly on both sides of +# the cross-org mirror: vyos/mergify uses @vyos/maintainers, +# VyOS-Networks/mergify uses @VyOS-Networks/maintainers. +# +# Replaces the inline T8531 predecessor config. Rollout context: +# T8782 (Mergify central-config rollout), T8852 (fleet migration to +# `extends:`). See https://vyos.dev/T8782, https://vyos.dev/T8852, +# and the Confluence spec at +# https://vyos.atlassian.net/wiki/spaces/VYOS/pages/849477640. -commands_restrictions: - backport: &allowed - conditions: - - or: - - sender=@vyos/maintainers - - sender=vyosbot - copy: *allowed - dequeue: *allowed - queue: *allowed - rebase: *allowed - refresh: *allowed - requeue: *allowed - squash: *allowed - update: *allowed +extends: mergify |