Skip to content

Commit 0ebc2d1

Browse files
authored
fix: renovata auto merge (#116)
1 parent c692fff commit 0ebc2d1

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/renovate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: renovatebot/github-action@v44.0.3
2525
with:
2626
configurationFile: renovate.json
27-
token: ${{ github.token }}
27+
token: ${{ secrets.RENOVATE_TOKEN != '' && secrets.RENOVATE_TOKEN || github.token }}
2828
env:
2929
LOG_LEVEL: debug
3030
RENOVATE_REPOSITORIES: ${{ github.repository }}

renovate.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,16 @@
130130
],
131131
"packageRules": [
132132
{
133-
"description": "Never automerge major updates",
133+
"description": "Automerge major updates after checks pass",
134134
"matchUpdateTypes": ["major"],
135-
"automerge": false
135+
"automerge": true,
136+
"automergeType": "pr",
137+
"platformAutomerge": true
138+
},
139+
{
140+
"description": "Keep ESLint on v9 until typescript-eslint adds ESLint v10 support",
141+
"matchPackageNames": ["eslint"],
142+
"allowedVersions": "<10.0.0"
136143
},
137144
{
138145
"description": "Keep ESLint on v9 until typescript-eslint adds ESLint v10 support",

0 commit comments

Comments
 (0)