summaryrefslogtreecommitdiff
path: root/docs/configuration/service
diff options
context:
space:
mode:
authorYuriy Andamasov <yuriy@vyos.io>2026-05-12 09:33:26 +0300
committerYuriy Andamasov <yuriy@vyos.io>2026-05-12 09:33:26 +0300
commit3cdfbc28c17f1106a73647458bb6dd4fb548cd8a (patch)
tree51831b76ee498517c3ec8927a054accda8de1d7c /docs/configuration/service
parent566cf955b4348cb81fea27e8d21a54e0b335f10e (diff)
downloadvyos-documentation-3cdfbc28c17f1106a73647458bb6dd4fb548cd8a.tar.gz
vyos-documentation-3cdfbc28c17f1106a73647458bb6dd4fb548cd8a.zip
T8782: adopt central Mergify baseline via `extends: mergify`
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)
Diffstat (limited to 'docs/configuration/service')
0 files changed, 0 insertions, 0 deletions