diff --git a/.github/renovate.json b/.github/renovate.json index c1428073..8204dbfc 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -6,7 +6,6 @@ "semanticCommitScope": "deps", "postUpgradeTasks": { "commands": ["npx prettier --no-color --write ."], - "fileFilters": ["**/**"], "executionMode": "branch" }, "packageRules": [ @@ -27,11 +26,11 @@ "semanticCommitType": "build" }, { - "matchPaths": [".github/workflows/**"], + "matchFileNames": [".github/workflows/**"], "semanticCommitType": "ci" }, { - "matchPaths": ["**/*.md"], + "matchFileNames": ["**/*.md"], "extends": [ "schedule:weekly", "github>bfra-me/renovate-config:automerge/enabled" diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index f56feea2..2b55bc53 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -97,7 +97,7 @@ concurrency: permissions: {} env: - RENOVATE_VERSION: 35.159.7 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate + RENOVATE_VERSION: 36.7.0 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate jobs: renovate: @@ -128,7 +128,6 @@ jobs: cache: ${{ inputs.cache && !inputs.dry_run && 'true' || github.event_name == 'schedule' && 'true' || 'false' }} zzglobal_config: |- { - allowPostUpgradeCommandTemplating: true, allowedPostUpgradeCommands: [ '^npm ci( --ignore-scripts)?$', '^(npx|pnpm|yarn) prettier( --no-color)? --write \\.$', @@ -141,7 +140,7 @@ jobs: ], onboardingConfig: { '$schema': 'https://docs.renovatebot.com/renovate-schema.json', - extends: ['github>bfra-me/renovate-config#v1.4.0'], + extends: ['github>bfra-me/renovate-config#v1.8.0'], }, onboardingConfigFileName: '.github/renovate.json5', onboardingPrTitle: 'feat(deps): configure Renovate', diff --git a/automerge.json b/automerge.json index 5406fd05..3e2363fb 100644 --- a/automerge.json +++ b/automerge.json @@ -11,7 +11,6 @@ "enabled": { "automerge": true, "addLabels": ["automerge"], - "platformAutomerge": true, "azureAutoApprove": true, "gitLabAutomerge": true, "gitLabIgnoreApprovals": true, diff --git a/default.json b/default.json index 97000f4a..362f7067 100644 --- a/default.json +++ b/default.json @@ -5,7 +5,7 @@ "ignorePresets": [":ignoreModulesAndTests"], "extends": [ - "config:base", + "config:recommended", ":semanticCommits", ":separateMultipleMajorReleases", "docker:enableMajor",