diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d275edc73..9d014f838 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -21,9 +21,9 @@ "requireConfig": "optional", "dependencyDashboardTitle": "Renovate Dashboard 🤖", "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"], - "rebaseWhen": "conflicted", - "assigneesFromCodeOwners": true, - "reviewersFromCodeOwners": true, + "rebaseWhen": "auto", + "commitBodyTable": true, + "platformCommit": "enabled", "ignorePaths": [ "**/*.sops.*", "**/.archive/**", diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 59a62244c..35f4bac54 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -13,10 +13,6 @@ on: description: Log Level default: debug required: false - version: - description: Renovate version - default: latest - required: false schedule: - cron: "0 * * * *" push: @@ -31,8 +27,6 @@ concurrency: # Retrieve BOT_USER_ID via `curl -s "https://api.github.com/users/${BOT_USERNAME}%5Bbot%5D" | jq .id` env: - RENOVATE_PLATFORM: github - RENOVATE_PLATFORM_COMMIT: true RENOVATE_ONBOARDING_CONFIG_FILE_NAME: .github/renovate.json5 RENOVATE_AUTODISCOVER: true RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}" @@ -40,7 +34,6 @@ env: RENOVATE_GIT_AUTHOR: "${{ secrets.BOT_USERNAME }} <${{ secrets.BOT_USER_ID }}+${{ secrets.BOT_USERNAME }}[bot]@users.noreply.github.com>" WORKFLOW_RENOVATE_DRY_RUN: false WORKFLOW_RENOVATE_LOG_LEVEL: debug - WORKFLOW_RENOVATE_VERSION: latest jobs: renovate: @@ -70,4 +63,3 @@ jobs: with: configurationFile: "${{ env.RENOVATE_ONBOARDING_CONFIG_FILE_NAME }}" token: "${{ steps.app-token.outputs.token }}" - renovate-version: "${{ github.event.inputs.version || env.WORKFLOW_RENOVATE_VERSION }}"