diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-28 01:40:53 +0300 |
|---|---|---|
| committer | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-28 01:40:53 +0300 |
| commit | 93e1494c174b30217e5d5f084a3db4b006c5d635 (patch) | |
| tree | e9a73524c7abc2e5cd1a1996d4075850d8b18733 | |
| parent | ba312ee82d0cf76dd8fc2f27a00f3f0a5906927d (diff) | |
| download | mergify-claude/intelligent-liskov-755b95.tar.gz mergify-claude/intelligent-liskov-755b95.zip | |
T8782: fix update_method value + correct backport label release mappingclaude/intelligent-liskov-755b95
Address review feedback on PR #6:
- queue_rule.update_method: rebase -> merge. `update_method` only accepts
`merge` or `rebase`; rebase rewrites SHAs and loses fork-PR support, so
merge is the fork-safe, SHA-preserving choice. Rewrote the rationale
comment accordingly.
- Backport label vocabulary release mapping corrected to the authoritative
VyOS codename->version map (all LTS):
circinus 1.5.x (was missing the LTS tag)
equuleus 1.3.x (was wrongly 1.6.x)
crux 1.2.x (was wrongly 1.3.x "legacy")
🤖 Generated by [robots](https://vyos.io)
| -rw-r--r-- | .mergify.yml | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/.mergify.yml b/.mergify.yml index e8ba043..bb38425 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -44,11 +44,13 @@ defaults: # single value below without redefining the whole queue. # # Why these specific defaults: - # - update_method: rebase -- keep enqueued PRs up to date by rebasing - # on base, not merging base into the branch. Avoids the noisy - # "Merge branch 'current' into <pr>" commits the manual flow creates - # today and addresses Alex's ask in the kick-off meeting about auto- - # rebasing PRs when other PRs land first. + # - update_method: merge -- keep enqueued PRs up to date by merging + # the base branch in. `update_method` only accepts `merge` or + # `rebase`; `rebase` rewrites commit SHAs and loses fork-PR support, + # so `merge` is the fork-safe, SHA-preserving choice (consistent with + # preferring the `update` action over `rebase` elsewhere in the + # fleet). Addresses Alex's kick-off ask to auto-advance enqueued PRs + # when other PRs land first. # - merge_method: merge -- preserve PR boundaries via a merge commit # while individual commits remain linear on the base branch (the # semi-linear pattern described at @@ -68,7 +70,7 @@ defaults: # shape can graduate to central. # ------------------------------------------------------------------ queue_rule: - update_method: rebase + update_method: merge merge_method: merge batch_size: 1 @@ -90,9 +92,9 @@ defaults: # Label Backport branch VyOS release line # -------------------------- ------------------ ------------------ # backport/sagitta sagitta 1.4.x (LTS) -# backport/circinus circinus 1.5.x -# backport/equuleus equuleus 1.6.x -# backport/crux crux 1.3.x (legacy) +# backport/circinus circinus 1.5.x (LTS) +# backport/equuleus equuleus 1.3.x (LTS) +# backport/crux crux 1.2.x (LTS) # # Convention for the source PR maintainer: # - "Backport now" (today's behavior): post `@Mergifyio backport |