summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Andamasov <yuriy@andamasov.com>2026-05-13 08:58:47 -0700
committerYuriy Andamasov <yuriy@andamasov.com>2026-05-13 08:58:47 -0700
commitfcf1d514719b9eb81a866cbe01b7c871798db2d1 (patch)
tree2152970cf947799ae8ed03f8a88c79a7a0f79caf
parentdd9a5da01538d19e02538ef2d7f936fb31a9925f (diff)
downloadvyos-http-api-tools-fcf1d514719b9eb81a866cbe01b7c871798db2d1.tar.gz
vyos-http-api-tools-fcf1d514719b9eb81a866cbe01b7c871798db2d1.zip
T8852: migrate .github/mergify.yml to extends: mergify
-rw-r--r--.github/mergify.yml43
1 files changed, 19 insertions, 24 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index b2cf6ac..f22266c 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/vyos-http-api-tools.
+#
+# 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