diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fa6a8b7e3..813f10a70 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,11 +16,14 @@ version: 2 updates: - package-ecosystem: "gomod" directory: "/" + target-branch: "main" schedule: interval: "daily" cooldown: - default-days: 7 + default-days: 0 # zizmor: ignore[dependabot-cooldown] open-pull-requests-limit: 10 + allow: + - dependency-type: "all" commit-message: prefix: "deps" groups: @@ -35,13 +38,56 @@ updates: # v2.12.0 and v2.12.1 break linux/386 compilation (hanwen/go-fuse#628). - dependency-name: "github.com/hanwen/go-fuse/v2" versions: ["= 2.12.0", "= 2.12.1"] + # Pinned to v0.60.0: v0.61.0+ prints a deprecation notice to the standard logger on first use. + - dependency-name: "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric" + versions: [">= 0.61.0"] + + - package-ecosystem: "gomod" + directory: "/" + target-branch: "v1" + schedule: + interval: "daily" + cooldown: + default-days: 0 # zizmor: ignore[dependabot-cooldown] + open-pull-requests-limit: 10 + allow: + - dependency-type: "all" + commit-message: + prefix: "deps" + groups: + non-major-dependencies: + applies-to: version-updates + patterns: + - "*" + update-types: + - "minor" + - "patch" + ignore: + # v2.12.0 and v2.12.1 break linux/386 compilation (hanwen/go-fuse#628). + - dependency-name: "github.com/hanwen/go-fuse/v2" + versions: ["= 2.12.0", "= 2.12.1"] + + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "daily" + cooldown: + default-days: 0 # zizmor: ignore[dependabot-cooldown] + open-pull-requests-limit: 10 + commit-message: + prefix: "deps" + groups: + container-images: + applies-to: version-updates + patterns: + - "*" - package-ecosystem: "github-actions" directory: "/" schedule: interval: "daily" cooldown: - default-days: 7 + default-days: 0 # zizmor: ignore[dependabot-cooldown] open-pull-requests-limit: 10 commit-message: prefix: "chore" diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 859aeec49..149cd8ab8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,18 +1,9 @@ { + "enabled": false, "extends": [ "config:recommended" ], "dependencyDashboardLabels": ["type: process"], - "commitMessagePrefix": "deps: ", - // Go modules and GitHub Actions are managed by Dependabot (.github/dependabot.yml). - // Keep Renovate strictly for Dockerfiles (Dockerfile and Dockerfile.alpine) so - // base-image digest bumps land immediately without Dependabot's 7-day cooldown. - "enabledManagers": ["dockerfile"], - "packageRules": [ - { - "matchManagers": ["dockerfile"], - "groupName": "container images", - "prPriority": 10 - } - ] + "commitMessagePrefix": "deps: " + // Go modules, Dockerfiles, and GitHub Actions are managed by Dependabot (.github/dependabot.yml). }