diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-10 18:43:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-10 18:43:51 +0300 |
| commit | 266acf2829fdcf809fe851203d8e34167075dd3f (patch) | |
| tree | 5c8e106d422e003644f77469e2c014b8faf71e0b | |
| parent | 644c8b8a143402326fee572ae284321073921d7c (diff) | |
| parent | d903a624f60fd811c88ab47fddb84026d271489e (diff) | |
| download | vyos-documentation-266acf2829fdcf809fe851203d8e34167075dd3f.tar.gz vyos-documentation-266acf2829fdcf809fe851203d8e34167075dd3f.zip | |
Merge pull request #1943 from vyos/yuriy/fix-prs-conflict-workflow-ref
ci+docs: fix open-prs-conflict caller ref + refresh Mergify backport guidance
| -rw-r--r-- | .github/workflows/check-open-prs-conflict.yml | 2 | ||||
| -rw-r--r-- | AGENTS.md | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml index 9667fd62..f7b32cbf 100644 --- a/.github/workflows/check-open-prs-conflict.yml +++ b/.github/workflows/check-open-prs-conflict.yml @@ -13,5 +13,5 @@ permissions: jobs: check-pr-conflict-call: - uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current + uses: vyos/.github/.github/workflows/check-pr-conflict.yml@current secrets: inherit @@ -50,13 +50,14 @@ One long-lived branch per VyOS release line. Branch names are constellations sor | `equuleus` | 1.3.x (legacy) | | `crux` | 1.2.x (legacy) | -PRs target `rolling`. After merge, request backports via a **post-merge comment** on the PR: +PRs target `rolling`. After merge, request backports via a **post-merge comment** on the PR. Multiple branches go in a single command, space-separated: ```text -@Mergifyio backport circinus -@Mergifyio backport sagitta +@Mergifyio backport circinus sagitta ``` +Only **Maintainers team members** can invoke `@Mergifyio` commands — Mergify silently drops commands from anyone outside the team (no error reply). If a backport doesn't trigger, check team membership first. Ask a Maintainer to post the comment on your behalf. + Mergify only reads commands from **PR comments** — mentions in the PR body are ignored. Mergify is configured at the org level (no `.mergify.yml` in the repo). The PR template has a `## Backport` section to declare intent, but that does not trigger the backport; the comment does. |