feat(digest): rebase opted-in fork feature branches nightly - #7
Merged
Conversation
The org digest synced fork mirror branches (merge-upstream) but left feature branches to rot once their base advanced. Add an opt-in `rebase_globs` field in forks.yml: for each match, rebase onto the freshly-synced upstream_track base and force-push clean ones (PAT push ⇒ the fork's CI re-runs), reporting conflicts in the email + a subject tag without failing the run. Enabled on ledoent/ddmrp (19.0-mig-*/ 19.0-fix-*) so its ~16 not-yet-upstreamed submodule MIGs stay mergeable on the 1-2/day cadence. Also carries the in-progress ledoent-overlay rebase check and the install_forward_port flips that were already staged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
The daily org digest (
fork-sync-and-digest.yml) synced each fork's mirror branches viamerge-upstreambut did nothing for feature branches — once their base advanced they silently went stale (ddmrp's are 9–96 commits behind today).New: opt-in
rebase_globsinforks.yml. For each matching branch the collect step rebases it onto the freshly-syncedupstream_trackbase and force-pushes the clean ones with the fork-sync PAT (so the fork'stests/pre-commitre-run — aGITHUB_TOKENpush wouldn't). Conflicts are reported, never pushed.Enabled on
ledoent/ddmrp(19.0-mig-*,19.0-fix-*) so its ~16 not-yet-upstreamed submodule MIGs stay mergeable for the 1–2-PR/day upstreaming cadence.Digest surface
⚠️ N rebase conflicttag. Conflicts are actionable but not a script failure —digest.exitstays0.rebase-results.jsonadded to the run artifact.Also carried (was already staged)
check_ledoent_branch) + its workflow setup (Python, git-aggregator, git identity).install_forward_port: true → falseflips across OCA forks.Notes for review
timeout-minutes15 → 30 (collect now clones+rebases, not just API calls).pytest .github/scripts/tests/→ 39 passing).