Skip to content

ci(forks): rebase OpenUpgrade feature branches nightly #14

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

Closed
dnplkndll wants to merge 1 commit into from
Closed

ci(forks): rebase OpenUpgrade feature branches nightly #14

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
6 changes: 6 additions & 0 deletions .github/forks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ forks:
upstream_org: OCA
upstream_track: "19.0"
install_forward_port: false
# We carry ~30 not-yet-merged feature branches here and upstream moves
# fast (200+ commits in five weeks), so without this they silently rot.
# Conflicts are reported and never pushed, which is what we want: a
# conflict on an OpenUpgrade branch usually means upstream has since
# done that module, so it needs a per-module look, not an auto-rebase.
rebase_globs: ["19.0-mig-*", "19.0-fix-*"]

- repo: ledoent/server-tools
branches: ["18.0", "19.0", "20.0"]
Expand Down
Loading