T8782: adopt central Mergify baseline via extends: mergify (backport #2005)#2007
Merged
Conversation
Adds .github/mergify.yml that inherits from vyos/mergify:.mergify.yml. The central baseline provides: - defaults.actions.backport.ignore_conflicts: false (new in T8782 — makes backport conflicts fail loudly instead of committing literal `<<<<<<< / ======= / >>>>>>>` markers; see incident below) - pull_request_rules → label conflicting PRs with `conflicts` - commands_restrictions → restrict @Mergifyio slash commands to @vyos/maintainers + vyosbot Why this repo, why now: 2026-05-12, PR #1994 was backported via `@Mergifyio backport sagitta circinus`. Cherry-pick conflicted in docs/conf.py; Mergify's pre-T8782 default (`ignore_conflicts: true`) committed the markers, the resulting PRs (#1998 / #1999) were merged anyway, and Read the Docs builds on both branches broke with `SyntaxError: invalid syntax (conf.py, line 309)`. Fix-forwards #2000 (circinus) and #2001 (sagitta) restored both branches. Adopting the central baseline closes the gap for this repo so the same failure mode cannot recur via the Mergify-managed backport path. Spec: https://vyos.atlassian.net/wiki/spaces/VYOS/pages/849477640 IS-432: https://vyos.atlassian.net/browse/IS-432 🤖 Generated by [robots](https://vyos.io) (cherry picked from commit 3cdfbc2)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change Summary
Adds
.github/mergify.ymlthat inherits the central baseline fromvyos/mergify:.mergify.ymlviaextends: mergify. This brings four behaviors into the repo:defaults.actions.backport.ignore_conflicts: false— the new safety default added in T8782. Backport cherry-picks that conflict now fail loudly (error comment on the source PR, no destination PR created) instead of committing literal<<<<<<< / ======= / >>>>>>>markers.pull_request_rules→ label conflicting PRs withconflicts.commands_restrictions→@Mergifyioslash commands restricted to@vyos/maintainers+vyosbot.This repo currently has no
.mergify.yml— backports run off Mergify GitHub-App defaults. After this PR merges, all four inherited behaviors apply.Incident driving this adoption (2026-05-12)
vyos-documentation#1994 was backported via
@Mergifyio backport sagitta circinus. Cherry-pick conflicted indocs/conf.py; Mergify's pre-T8782 default (ignore_conflicts: true) committed the markers. The resulting PRs (#1998, #1999) were merged anyway, and Read the Docs builds on bothcircinusandsagittafailed withSyntaxError: invalid syntax (conf.py, line 309). Fix-forwards #2000 (circinus) and #2001 (sagitta) removed the markers and re-applied the patch correctly.Adopting the central baseline closes the gap for this repo so the same failure mode cannot recur via the Mergify-managed backport path.
Related Task(s)
Related PR(s)
vyosorg (this PR depends on it being merged first)VyOS-NetworksorgBackport
Not applicable — this is a CI/configuration change, not a documentation content change.
Verification before merge
After the central baseline PR (vyos/mergify#1) lands and this PR merges, run the end-to-end verification on a throwaway PR per the T8782 spec: deliberately introduce a conflicting backport and confirm Mergify (a) posts an error comment on the source PR, (b) does not open a destination PR, and (c) does not commit a marker file anywhere.
🤖 Generated by robots
This is an automatic backport of pull request #2005 done by Mergify.