ci: have renovate rebase stale PRs before merging#4782
Merged
Conversation
Set rebaseWhen=behind-base-branch in the package.json renovate block so any renovate PR whose base has moved gets re-pushed and re-tested against the new tip before it can land. This closes a class of merge-time race we just hit: PR #4781 (tinyexec 1.1.2 -> 1.2.2) passed CI on a base that pinned pnpm@11.1.2, but was squash-merged on top of master after PR #4776 had bumped pnpm to 11.3.0. pnpm 11.3.0 added a supply-chain verification pass that re-applies the default minimumReleaseAge (1440 min) to every lockfile entry on every install -- 11.1.2 only checked it at resolve time, so the renovate PR's --frozen-lockfile run never noticed tinyexec@1.2.2 was too new. Post-merge, master CI failed with ERR_PNPM_MINIMUM_RELEASE_AGE_VIOLATION until the package aged in. Forcing a rebase before merge surfaces that mismatch in the PR run, where it can be retried or held, instead of breaking master. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
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
1 participant
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.
Set rebaseWhen=behind-base-branch in the package.json renovate block so any renovate PR whose base has moved gets re-pushed and re-tested against the new tip before it can land.
This closes a class of merge-time race we just hit: PR #4781 (tinyexec 1.1.2 -> 1.2.2) passed CI on a base that pinned pnpm@11.1.2, but was squash-merged on top of master after PR #4776 had bumped pnpm to 11.3.0. pnpm 11.3.0 added a supply-chain verification pass that re-applies the default minimumReleaseAge (1440 min) to every lockfile entry on every install -- 11.1.2 only checked it at resolve time, so the renovate PR's --frozen-lockfile run never noticed tinyexec@1.2.2 was too new. Post-merge, master CI failed with
ERR_PNPM_MINIMUM_RELEASE_AGE_VIOLATION until the package aged in.
Forcing a rebase before merge surfaces that mismatch in the PR run, where it can be retried or held, instead of breaking master.