Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnplkndll merged 1 commit into from
Jul 30, 2026
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/forks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Loading