chore(renovate): enable auto merge #5322
Open
+9
−5
Conversation
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
related to #5214
1 task
tasso94
commented
Jul 31, 2025
| @@ -3,7 +3,8 @@ | |||
| "extends": [ | |||
| "config:base" | |||
| ], | |||
| "branchName": "{{{baseBranch}}}-{{{branchTopic}}}", | |||
| "rebaseWhen": "behind-base-branch", | |||
| "branchName": "{{{baseBranch}}}-renovate-{{{branchTopic}}}", | |||
There was a problem hiding this comment.
- Adding
-renovatesuffix so that the branch protection rule needed for auto-merge can distinguish between feature branches and renovate branches. {{{baseBranch}}}must always come first since otherwise our CI wouldn't run.
tasso94
commented
Jul 31, 2025
| @@ -3,7 +3,8 @@ | |||
| "extends": [ | |||
| "config:base" | |||
| ], | |||
| "branchName": "{{{baseBranch}}}-{{{branchTopic}}}", | |||
| "rebaseWhen": "behind-base-branch", | |||
There was a problem hiding this comment.
PRs should be rebased when behind base branch.
HeleneW-dot
approved these changes
Jul 31, 2025
tasso94
commented
Jul 31, 2025
There was a problem hiding this comment.
I mistakenly already committed this to master without review :(
Maybe we can catch up on this now.
tasso94
commented
Jul 31, 2025
| name: All checks passed | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| checks: read | ||
| contents: read | ||
| environment: delayenv |
There was a problem hiding this comment.
Run will be delayed for 180 minutes. I don't know if this is enough to run our whole CI. However, we can tweak this.
HeleneW-dot
approved these changes
Jul 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
related to #5214