summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2026-05-12 11:29:25 +0100
committerGitHub <noreply@github.com>2026-05-12 11:29:25 +0100
commit064940f887e09f040a30a2cb01e1c032f8a82bf1 (patch)
tree99508b87ab7a914b32bf73717406efa6f2c2c7a3 /scripts
parenta4f5c979c88078eab780c3807880aff869cd5928 (diff)
downloadvyos-documentation-064940f887e09f040a30a2cb01e1c032f8a82bf1.tar.gz
vyos-documentation-064940f887e09f040a30a2cb01e1c032f8a82bf1.zip
T8782: adopt central Mergify baseline via `extends: mergify` (#2006)
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 3cdfbc28c17f1106a73647458bb6dd4fb548cd8a) Co-authored-by: Yuriy Andamasov <yuriy@vyos.io>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions