Page MenuHomeVyOS Platform
Files F119064236

No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 9f5e1fdd5..705070b1b 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,27 +1,30 @@
-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-1x.
+#
+# 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
+
+# ------------------------------------------------------------------
+# Repo-specific overlay: keep the existing `merge_protections_settings`
+# from the T8531-era inline config. This is a Mergify v8 top-level
+# setting that the central baseline does not provide. Preserving it
+# keeps the same reporting behavior (`check-runs`) that vyos-1x has
+# relied on under the inline config.
+# ------------------------------------------------------------------
merge_protections_settings:
reporting_method: check-runs

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 6, 9:41 AM (3 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4654008
Default Alt Text
(2 KB)

Event Timeline