Skip to content

Conversation

echoix
Copy link
Collaborator

@echoix echoix commented Mar 26, 2025

This PR starts the configuration needed for enabling automerge with renovate.

For now, it won’t work as is, for example, because of the way the CODEOWNERS file is written, and the old branch protection settings.
But, it is still useful to start learning on how it works, what Renovate would consider ready to automerge. We will still need to place approvals for now.

Later on, we will need to adapt the repo’s config to use rulesets, and define our restrictions and approval settings there. After that, the CODEOWNERS file would be kinda useless.

Automerge doesn’t apply to all PRs. We configure for what of the Renovate PRs we want, for now, lock file maintenance, pin, digest and patch updates. Other non-renovate PRs aren’t affected. On GitHub, it uses the platform’s automerge functionality.

PRs should be merged with squash-merge, since it is our default merge method (if not the only one allowed). The renovate config for automergeStrategy is left to « auto ». https://docs.renovatebot.com/configuration-options/#automergestrategy

Proposed Changes

Readiness Checklist

Author/Contributor

  • Add entry to the CHANGELOG listing the change and linking to the corresponding issue (if appropriate)
  • If documentation is needed for this change, has that been included in this pull request

Reviewing Maintainer

  • Label as breaking if this is a large fundamental change
  • Label as either automation, bug, documentation, enhancement, infrastructure, or performance

@echoix echoix merged commit 73c05ba into oxsecurity:main Mar 29, 2025
6 checks passed
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