Skip to content

chore(renovate): enable auto merge #5322

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+9 −5
Open

chore(renovate): enable auto merge #5322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8afad4
chore(renovate): enable auto merge
tasso94 Jul 31, 2025
5968f80
Merge branch 'master' into 5214-enable-auto-merge
tasso94 Jul 31, 2025
2b1aa6e
Update renovate-auto-merge.yml
tasso94 Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"extends": [
"config:base"
],
"branchName": "{{{baseBranch}}}-{{{branchTopic}}}",
"rebaseWhen": "behind-base-branch",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PRs should be rebased when behind base branch.

"branchName": "{{{baseBranch}}}-renovate-{{{branchTopic}}}",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Adding -renovate suffix 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.

"addLabels": [
"dependencies"
],
Expand All @@ -22,7 +23,7 @@
"enabled": false
},
"lockFileMaintenance": {
//"automerge": true // auto-merge will be activated in a second step
"automerge": true
"enabled": true,
"addLabels": [
"automerge",
Expand Down Expand Up @@ -57,7 +58,7 @@
"enabled": false
},
{
//"automerge": true // auto-merge will be activated in a second step
"automerge": true
"matchUpdateTypes": [
"patch"
],
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/renovate-auto-merge.yml
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mistakenly already committed this to master without review :(
Maybe we can catch up on this now.

Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ on:
types: [ opened, synchronize, reopened ]
jobs:
all-checks-passed:
if: contains(github.event.pull_request.labels.*.name, 'automerge') && github.actor == 'renovate[bot]'
if: ${{ contains(github.event.pull_request.labels.*.name, 'automerge') && github.actor == 'renovate[bot]'}}
name: All checks passed
runs-on: ubuntu-latest
permissions:
checks: read
contents: read
environment: delayenv
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

steps:
- uses: wechuli/allcheckspassed@v1.2.0
- uses: wechuli/allcheckspassed@v1
with:
poll: false