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

chore(ci): tweak renovate preset to better align with branch rulesets #6648

Merged
merged 2 commits into from
May 14, 2024

Conversation

stipsan
Copy link
Member

@stipsan stipsan commented May 14, 2024

This PR tweaks our Renovatebot preset to better align with changes to this repository settings since its introduction:

  • Pull requests require code reviews from codeowners before merging.
  • Pull requests require at least 1 code review from someone with write access before merging.
  • GitHub Merge queues are enabled.
  • If a rebase or a merge commit is pushed to a PR then existing PR review approvals are automatically dismissed and require re-approval to merge.

With those rules in mind these are the changes to our Renovate config:

  • The "rebaseWhen": "behind-base-branch" rule is removed since it causes Renovatebot to always rebase a PR everytime someone pushes a commit to next. Removing this rule allows you to queue up Renovate PRs and batch them. It also greatly reduces the amount of Vercel deployments of the test studios as Renovatebot will only automatically rebase PRs if there's a merge conflict moving forward.
  • The automerge is set to true for minor and patch updates. Note that this doesn't bypass any rules such as required code review. It has the same effect as pressing "Merge when ready" manually, and allows speeding up maintenance as PRs are queued the second they have the required approvals from code owners, without waiting for another maintainer to notice that it's ready to merge.

And as a bonus, for deps that live in "dev/**/package.json" we're now grouping deps that are minor and patch.
This way the Studio DX team will no longer have to deal with these deps bumping separately:

  • @sanity/react-loader
  • @sanity/visual-editing
  • next
  • @sanity/assist

@stipsan stipsan requested a review from a team as a code owner May 14, 2024 09:39
@stipsan stipsan requested a review from juice49 May 14, 2024 09:39
Copy link

vercel bot commented May 14, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
performance-studio ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 14, 2024 9:40am
test-next-studio ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 14, 2024 9:40am
test-studio ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 14, 2024 9:40am
1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
studio-workshop ⬜️ Ignored (Inspect) May 14, 2024 9:40am

Copy link
Contributor

No changes to documentation

Copy link
Contributor

Component Testing Report Updated May 14, 2024 9:48 AM (UTC)

File Status Duration Passed Skipped Failed
comments/CommentInput.spec.tsx ✅ Passed (Inspect) 39s 15 0 0
formBuilder/ArrayInput.spec.tsx ✅ Passed (Inspect) 7s 3 0 0
formBuilder/inputs/PortableText/Annotations.spec.tsx ✅ Passed (Inspect) 27s 6 0 0
formBuilder/inputs/PortableText/copyPaste/CopyPaste.spec.tsx ✅ Passed (Inspect) 31s 11 7 0
formBuilder/inputs/PortableText/Decorators.spec.tsx ✅ Passed (Inspect) 14s 6 0 0
formBuilder/inputs/PortableText/FocusTracking.spec.tsx ✅ Passed (Inspect) 36s 15 0 0
formBuilder/inputs/PortableText/Input.spec.tsx ✅ Passed (Inspect) 1m 5s 13 0 0
formBuilder/inputs/PortableText/ObjectBlock.spec.tsx ✅ Passed (Inspect) 1m 5s 18 0 0
formBuilder/inputs/PortableText/PresenceCursors.spec.tsx ✅ Passed (Inspect) 7s 3 9 0
formBuilder/inputs/PortableText/RangeDecoration.spec.tsx ✅ Passed (Inspect) 20s 9 0 0
formBuilder/inputs/PortableText/Styles.spec.tsx ✅ Passed (Inspect) 15s 6 0 0
formBuilder/inputs/PortableText/Toolbar.spec.tsx ✅ Passed (Inspect) 21s 9 0 0

@stipsan stipsan disabled auto-merge May 14, 2024 12:41
@stipsan stipsan merged commit 80b1a44 into next May 14, 2024
39 checks passed
@stipsan stipsan deleted the update-renovate-preset branch May 14, 2024 12:42
stipsan added a commit that referenced this pull request May 14, 2024
github-merge-queue bot pushed a commit that referenced this pull request May 14, 2024
ricokahler pushed a commit that referenced this pull request May 14, 2024
…#6648)

* chore(ci): tweak renovate preset to better align with branch rulesets

* refactor(ci): only group non-major on dev/**/package.json deps
ricokahler pushed a commit that referenced this pull request May 14, 2024
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.

1 participant