summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2026-05-14 14:54:55 -0500
committerJohn Estabrook <jestabro@vyos.io>2026-05-14 14:56:54 -0500
commit3236642bc8315e61fdb1df5e13eb7d7137fb1838 (patch)
tree3ff6d0bcc3fe2b98888290fabcda6aa258a593a1
parent2baeab7595ec0d2971dc3557fd3e7ffcf9cb4a32 (diff)
downloadvyos-build-3236642bc8315e61fdb1df5e13eb7d7137fb1838.tar.gz
vyos-build-3236642bc8315e61fdb1df5e13eb7d7137fb1838.zip
T8852: restore migration to extends after merge
-rw-r--r--.github/mergify.yml23
1 files changed, 9 insertions, 14 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 752b88fe..10745438 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -17,19 +17,14 @@
# 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