Skip to content

ci: rebase Renovate pull requests when they are behind master - #81

Merged
JarbasAl merged 1 commit into
masterfrom
ci/renovate-rebase-behind-base
Sep 17, 2026
Merged

JarbasAl merged 1 commit into
masterfrom
ci/renovate-rebase-behind-base

Conversation

@openvoiceos-bot

Copy link
Copy Markdown
Contributor

Summary

This change adds renovate.json with rebaseWhen: behind-base-branch.

The repository has no Renovate configuration file on master. Renovate uses its default: it rebases a pull request only when the pull request has a conflict, or when a person ticks the rebase box in the pull request body. The six Renovate pull requests #48, #49, #51, #53, #55 and #56 have no conflict, so they stay on an old master.

With this setting, Renovate rebases each pull request that is behind master on its next run, under its own identity. No person edits a bot body.

What does not change

  • The file sets no extends, schedule, automerge or package rule. There is no org preset (OpenVoiceOS/renovate-config does not exist), so the other Renovate defaults stay as they are.
  • A rebase does not start validate_raw_jsons.yml on the six pull requests. That workflow has a paths filter (raw_jsons/**, two scripts, the workflow file), and the six pull requests change only frontend/package-lock.json. A workflow that runs on frontend/** is separate work.

Check after merge

On the next Renovate run, the six pull requests get a new head on master. git merge-base --is-ancestor origin/master <head> returns 0 for each.


AI-authorship disclosure: an AI agent (Claude) wrote this change and this description.

🤖 Generated with Claude Code

Renovate PRs opened before the pull_request workflow have no run.
With rebaseWhen behind-base-branch, Renovate rebases them onto master,
and the workflow runs on the new head.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Sep 17, 2026

Copy link
Copy Markdown

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@JarbasAl
JarbasAl marked this pull request as ready for review September 17, 2026 22:35
@JarbasAl
JarbasAl merged commit 4209ba4 into master Sep 17, 2026
1 check passed
@JarbasAl
JarbasAl deleted the ci/renovate-rebase-behind-base branch September 17, 2026 22:35
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.

2 participants