Skip to content

ci(forks): opt OpenUpgrade into nightly feature-branch rebasing - #11

Merged
dnplkndll merged 1 commit into
mainfrom
feat/auto-rebase-feature-branches
Jul 30, 2026
Merged

ci(forks): opt OpenUpgrade into nightly feature-branch rebasing#11
dnplkndll merged 1 commit into
mainfrom
feat/auto-rebase-feature-branches

Conversation

@dnplkndll

Copy link
Copy Markdown
Contributor

The org fork-sync already implements rebase_feature_branches (rebases rebase_globs branches onto the synced upstream_track and force-pushes so fork CI re-runs) — ddmrp already opts in. OpenUpgrade hadn't, so its ledoent CI overlay + unmerged 19.0-mig-*/19.0-fix-* branches drifted: ledoent hit 47 commits behind and ~72 stale branches piled up before this session's manual cleanup (129→64).

This adds rebase_globs: [ledoent, 19.0-mig-*, 19.0-fix-*] to OpenUpgrade's entry so the daily run rebases the overlay + migration branches onto fresh 19.0 automatically — retiring the broken notify-only path (the in-repo mirror-upstream drift-issue can't fire; Issues are disabled on the fork).

One-line behavior change + a NOTE refresh; no script/workflow changes (the mechanism already exists). 40 tests pass.

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).
@dnplkndll
dnplkndll merged commit bb168d6 into main Jul 30, 2026
1 check passed
@dnplkndll
dnplkndll deleted the feat/auto-rebase-feature-branches branch July 30, 2026 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant