Skip to content
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.

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

Renovate to renovate branch #6838

Merged
merged 3 commits into from Oct 27, 2021
Merged

Renovate to renovate branch #6838

merged 3 commits into from Oct 27, 2021

Conversation

dcousens
Copy link
Member

@dcousens dcousens commented Oct 27, 2021

As is, we have 8+ renovate pull requests for updating patch dependencies.
The Require branches to be up to date before merging for main results in a high maintenance burden and context-switching workflow as you need to wait for all the CI tests to pass and the branch to rebase each time you want to merge.

The new suggested strategy is to merge all passing renovate pull requests to a renovating branch, and at our discretion merge that renovating branch back to main on a periodical basis, verifying that the renovating->main pull request is additionally passing.

This allows us to side-step problematic renovate pull requests such as the #6810 which has some long-term baggage in respect to problematic dependency resolutions, or things like #6769 where eslint 8 has a bug that is preventing us from merging that at this time.

edit: we had to rename renovate to renovating, git does not support sub-branches (that is, you can't have renovate and renovate/foo, which @renovate-bot automatically creates)

@changeset-bot
Copy link

changeset-bot bot commented Oct 27, 2021

⚠️ No Changeset found

Latest commit: 896048a

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel
Copy link

vercel bot commented Oct 27, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/keystonejs/keystone-next-docs/GjM8vNhQjRLw1dCQio66ftSfKSZY
✅ Preview: https://keystone-next-docs-git-renovate-to-renovate-keystonejs.vercel.app

@codesandbox-ci
Copy link

codesandbox-ci bot commented Oct 27, 2021

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

@vercel vercel bot temporarily deployed to Preview October 27, 2021 01:54 Inactive
@vercel vercel bot temporarily deployed to Preview October 27, 2021 02:07 Inactive
@dcousens dcousens merged commit 8947bfd into main Oct 27, 2021
@dcousens dcousens deleted the renovate-to-renovate branch October 27, 2021 02:45
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.

None yet

2 participants