diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 6234eba..f878f1a 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -24,7 +24,7 @@ jobs: uses: renovatebot/github-action@v44.0.3 with: configurationFile: renovate.json - token: ${{ github.token }} + token: ${{ secrets.RENOVATE_TOKEN != '' && secrets.RENOVATE_TOKEN || github.token }} env: LOG_LEVEL: debug RENOVATE_REPOSITORIES: ${{ github.repository }} diff --git a/renovate.json b/renovate.json index 01245bc..bd7027a 100644 --- a/renovate.json +++ b/renovate.json @@ -130,9 +130,16 @@ ], "packageRules": [ { - "description": "Never automerge major updates", + "description": "Automerge major updates after checks pass", "matchUpdateTypes": ["major"], - "automerge": false + "automerge": true, + "automergeType": "pr", + "platformAutomerge": true + }, + { + "description": "Keep ESLint on v9 until typescript-eslint adds ESLint v10 support", + "matchPackageNames": ["eslint"], + "allowedVersions": "<10.0.0" }, { "description": "Keep ESLint on v9 until typescript-eslint adds ESLint v10 support",