From 55e1c389411209cfb46bccecdeac026e1df1ee3d Mon Sep 17 00:00:00 2001 From: Don Kendall Date: Sat, 20 Jun 2026 16:52:27 -0400 Subject: [PATCH] ci(forks): opt OpenUpgrade into nightly feature-branch rebasing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The fork-sync digest already implements rebase_feature_branches (rebases rebase_globs branches onto the synced upstream_track + force-pushes), but OpenUpgrade hadn't opted in — so its `ledoent` CI overlay and unmerged 19.0-mig-*/19.0-fix-* branches drifted (ledoent reached 47 commits behind, 72 stale branches accumulated). Add rebase_globs = [ledoent, 19.0-mig-*, 19.0-fix-*] so the overlay + migration branches auto-rebase nightly. Retires the broken notify-only path (the in-repo mirror-upstream drift issue can't fire — Issues are disabled on the fork). --- .github/forks.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/forks.yml b/.github/forks.yml index e5dd37d..28e6a6a 100644 --- a/.github/forks.yml +++ b/.github/forks.yml @@ -116,12 +116,19 @@ forks: # `branches:` — upstream PRs always target OCA's `19.0`, never # the overlay, so merging upstream into `ledoent` is the wrong # direction (would drop the overlay's customizations under a - # conflict). The overlay is rebased on top of 19.0 manually - # when it drifts too far. Only `19.0` gets auto-synced here. + # conflict). Only `19.0` gets fast-forward-synced via `branches:`. + # The overlay AND the unmerged migration branches need a REBASE onto + # 19.0 (the merge-upstream API can't rebase) — `rebase_globs` below + # makes the daily fork-sync (fork_sync_digest.rebase_feature_branches) + # rebase each matching branch onto the freshly-synced 19.0 and + # force-push it, so the fork CI re-runs. Replaces the old "rebased + # manually when it drifts" path that silently let `ledoent` fall 47 + # commits behind. branches: ["19.0", "20.0"] upstream_org: OCA upstream_track: "19.0" install_forward_port: false + rebase_globs: ["ledoent", "19.0-mig-*", "19.0-fix-*"] - repo: ledoent/server-tools branches: ["18.0", "19.0", "20.0"]