From 764eb7dc6f026b679afaef5b5eebd24a1d42574a Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Sun, 10 May 2026 18:29:17 +0300 Subject: ci: fix open-prs-conflict caller — point at correct vyos/.github workflow file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The caller workflow referenced `vyos/.github/.github/workflows/check-open-prs-conflict.yml@current`, but that file does not exist in `vyos/.github`. The workflow was renamed to `check-pr-conflict.yml` (without "open") at some point after the caller was added in 86a282ec (#1638, 2025-05-26). Result: every push to a watched branch since at least 2026-05-07 has produced a "workflow file issue" failure. Verified via `gh api repos/vyos/.github/contents/.github/workflows`. The called workflow is `workflow_call`-callable with no inputs, so this is a one-line ref fix. No behavior change to the caller's trigger list. 🤖 Generated by [robots](https://vyos.io) --- .github/workflows/check-open-prs-conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From d903a624f60fd811c88ab47fddb84026d271489e Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Sun, 10 May 2026 18:38:34 +0300 Subject: docs: refresh Mergify backport guidance — single-line syntax + maintainer-only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update example to the consolidated `@Mergifyio backport circinus sagitta` form (multiple branches in one command, space-separated). The one-branch-per-line form still works but is no longer required. - Document that only Maintainers team members can invoke @Mergifyio commands — Mergify silently drops commands from anyone outside the team, with no error reply. Useful failure mode to know about: if a backport does not trigger, check team membership first. 🤖 Generated by [robots](https://vyos.io) --- AGENTS.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 2d2b128d..321f8ba5 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -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. -- cgit v1.2.3