<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vyos-documentation.git/.github/mergify.yml, branch docs/t8887-phase1-batch1</title>
<subtitle>VyOS readthedocs (mirror of https://github.com/vyos/vyos-documentation.git)
</subtitle>
<id>https://git.amelek.net/vyos/vyos-documentation.git/atom?h=docs%2Ft8887-phase1-batch1</id>
<link rel='self' href='https://git.amelek.net/vyos/vyos-documentation.git/atom?h=docs%2Ft8887-phase1-batch1'/>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-documentation.git/'/>
<updated>2026-06-13T04:05:27+00:00</updated>
<entry>
<title>chore: T8937: move conflict labeling+comment from eps1lon GHA to Mergify (#2103)</title>
<updated>2026-06-13T04:05:27+00:00</updated>
<author>
<name>Yuriy Andamasov</name>
<email>yuriy@vyos.io</email>
</author>
<published>2026-06-13T04:05:27+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-documentation.git/commit/?id=03abd003d2f9456c450c5e0068efeaf130b89f33'/>
<id>urn:sha1:03abd003d2f9456c450c5e0068efeaf130b89f33</id>
<content type='text'>
Removes the eps1lon `check-open-prs-conflict.yml` caller (which ran
`eps1lon/actions-label-merge-conflict` on push to base branches to label
conflicting PRs + comment) and replaces it with Mergify:

- Conflict LABEL (`conflicts`): already handled by the inherited central
  `Label conflicting pull requests` rule (predicate `conflict`, toggle).
  Mergify re-evaluates continuously, so the GHA's push-triggered re-scan
  is covered natively — no local rule needed for the label.
- Conflict COMMENT: a local additive rule `Comment on conflicting pull
  requests` (distinct name → does not replace the inherited label rule)
  posts the contributor-facing "please resolve" notice once when a PR
  enters conflict (Mergify dedupes the comment per rule+message).

The GHA's clean-side "conflicts resolved" comment is intentionally NOT
replicated — Mergify has no "was-conflicting-now-clean" predicate, and
keying on `-conflict` would match every non-conflicting PR.

This is the final piece of the T8937 Mergify-GHA retirement (the central
`check-pr-conflict.yml` reusable was preserved pending this consumer; it
is deleted in a follow-up vyos/.github PR once this merges).

Advances: T8937

🤖 Generated by [robots](https://vyos.io)</content>
</entry>
<entry>
<title>ci: T8966: remove orphaned docs T-ID override (strict rule retired centrally) (#2083)</title>
<updated>2026-06-06T07:02:36+00:00</updated>
<author>
<name>Yuriy Andamasov</name>
<email>yuriy@vyos.io</email>
</author>
<published>2026-06-06T07:02:36+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-documentation.git/commit/?id=403bb21d9b6a0a0836fb6cb4bb2e4231ce2224e0'/>
<id>urn:sha1:403bb21d9b6a0a0836fb6cb4bb2e4231ce2224e0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>ci(mergify): upgrade configuration to current format</title>
<updated>2026-05-15T11:56:32+00:00</updated>
<author>
<name>mergify[bot]</name>
<email>37929162+mergify[bot]@users.noreply.github.com</email>
</author>
<published>2026-05-15T11:56:32+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-documentation.git/commit/?id=963a8fab38ce95a3afd3647ea574bafb5cf96f24'/>
<id>urn:sha1:963a8fab38ce95a3afd3647ea574bafb5cf96f24</id>
<content type='text'>
</content>
</entry>
<entry>
<title>ci(mergify): fix T-ID-override rule name to match central baseline</title>
<updated>2026-05-13T19:52:58+00:00</updated>
<author>
<name>Yuriy Andamasov</name>
<email>yuriy@vyos.io</email>
</author>
<published>2026-05-13T19:52:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-documentation.git/commit/?id=ee2942a39e11b8d7996ba2f7f3ac53545300d647'/>
<id>urn:sha1:ee2942a39e11b8d7996ba2f7f3ac53545300d647</id>
<content type='text'>
The override shipped in 3d44fe06 used rule names `Flag PR title not
matching T-ID format` + `Flag commit message not matching T-ID format`.
Per Mergify `extends:` semantics, same-name rules in the child REPLACE
the parent's — and the central baseline in vyos/mergify uses a single
rule named `Flag T-ID format violation in PR title or commit messages`.
Different names → no replacement → parent rule keeps firing.

Symptom (surfaced on PR #2014, title `docs(readme): …`): every PR
without a `T&lt;digits&gt;:` token gets `invalid-title` labeled.

Fix: collapse to one rule, rename to match the parent exactly. The
condition (`closed AND -closed`) still never matches, so `toggle`
removes the label on every evaluation — picks up any stale
`invalid-title` from the broken-override window.

The parent rule does not toggle `invalid-commit-title`; the
second child rule for that label was extraneous and is dropped.

🤖 Generated by [robots](https://vyos.io)
</content>
</entry>
<entry>
<title>ci(mergify): disable inherited T-ID title/commit-message checks in this repo</title>
<updated>2026-05-12T12:43:23+00:00</updated>
<author>
<name>Yuriy Andamasov</name>
<email>yuriy@vyos.io</email>
</author>
<published>2026-05-12T12:43:23+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-documentation.git/commit/?id=3d44fe06e3a82e63b1391424860d76f95bcb97f3'/>
<id>urn:sha1:3d44fe06e3a82e63b1391424860d76f95bcb97f3</id>
<content type='text'>
The central baseline at vyos/mergify:.mergify.yml enforces a
`T&lt;digits&gt;: &lt;text&gt;` (optional `scope: ` prefix) format on PR titles
and every commit's first line — a convention from vyos/vyos-1x and
sibling code repos where engineering work tracks against a Phorge
task.

vyos-documentation has never enforced this. Recent merged PRs use
conventional-commits style (`fix(ext): …`, `ci(...): …`,
`chore(deps): …`) without an upstream T-ID. After the
`extends: mergify` adoption in #2005, the inherited rules
started labeling every such PR `invalid-title` and
`invalid-commit-title` — pure noise for this repo.

Override the two rules by name (Mergify `extends:` semantics:
same-name rules in the child REPLACE the parent's). Conditions are
constructed to never match (`closed and -closed`), so the `toggle`
action always falls into the "remove label" branch and also clears
the labels from any PR that picked them up since #2005 merged.

🤖 Generated by [robots](https://vyos.io)
</content>
</entry>
<entry>
<title>T8782: adopt central Mergify baseline via `extends: mergify`</title>
<updated>2026-05-12T06:33:26+00:00</updated>
<author>
<name>Yuriy Andamasov</name>
<email>yuriy@vyos.io</email>
</author>
<published>2026-05-12T06:33:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-documentation.git/commit/?id=3cdfbc28c17f1106a73647458bb6dd4fb548cd8a'/>
<id>urn:sha1:3cdfbc28c17f1106a73647458bb6dd4fb548cd8a</id>
<content type='text'>
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
    `&lt;&lt;&lt;&lt;&lt;&lt;&lt; / ======= / &gt;&gt;&gt;&gt;&gt;&gt;&gt;` 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)
</content>
</entry>
</feed>
