From 4b764b3120fe1dcfdd4f752c1dcf981ebd320936 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Sep 2025 11:58:13 +0000 Subject: [PATCH 1/6] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000000..5db72dd6a94 --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ] +} From e09e822038d6f471bb8cfb71402fae8461db0790 Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Mon, 1 Sep 2025 13:16:04 +0100 Subject: [PATCH 2/6] [Infra] Update renovate configuration Port changes from #6446. --- .github/dependabot.yml | 71 ++-------------------------------------- .github/renovate.json | 61 ++++++++++++++++++++++++++++++++++ Directory.Packages.props | 58 ++++++++++++++++---------------- renovate.json | 6 ---- 4 files changed, 93 insertions(+), 103 deletions(-) create mode 100644 .github/renovate.json delete mode 100644 renovate.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f16a2c2d826..dda94ddd1f0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,75 +1,10 @@ +# This file is retained solely for automated tooling to see we do automated +# dependency updates as not all such scanners recognize the use of Renovate. version: 2 updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" - labels: - - "infra" - - package-ecosystem: "docker" - directory: "/examples/MicroserviceExample/WebApi" - schedule: - interval: "weekly" - day: "wednesday" - labels: - - "infra" - ignore: - - dependency-name: "*" - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" - - package-ecosystem: "docker" - directory: "examples/MicroserviceExample/WorkerService" - schedule: - interval: "weekly" - day: "wednesday" - labels: - - "infra" - ignore: - - dependency-name: "*" - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" - - package-ecosystem: "docker" - directory: "test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest" - schedule: - interval: "weekly" - day: "wednesday" - labels: - - "infra" - ignore: - - dependency-name: "*" - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" - - package-ecosystem: "docker" - directory: "test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests" - schedule: - interval: "weekly" - day: "wednesday" - labels: - - "infra" - ignore: - - dependency-name: "*" - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" - - package-ecosystem: "dotnet-sdk" - directory: "/" - schedule: - interval: "weekly" - day: "wednesday" - labels: - - "infra" - ignore: - - dependency-name: "*" - update-types: - - "version-update:semver-major" - - "version-update:semver-minor" - - package-ecosystem: "pip" - directory: "test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests" - schedule: - interval: "weekly" - day: "wednesday" + interval: yearly labels: - "infra" diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 00000000000..f57d0d2a4dc --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,61 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "additionalBranchPrefix": "{{manager}}/", + "automerge": false, + "commitBodyTable": true, + "commitMessageAction": "Bump", + "dependencyDashboard": false, + "extends": [ + "config:best-practices", + "customManagers:dockerfileVersions", + "customManagers:githubActionsVersions", + ":automergeRequireAllStatusChecks", + ":disableRateLimiting", + ":enableVulnerabilityAlerts", + ":gitSignOff", + ":ignoreUnstable" + ], + "labels": ["dependencies", "infra"], + "packageRules": [ + { + "matchManagers": ["dockerfile"], + "addLabels": ["docker"] + }, + { + "matchManagers": ["github-actions"], + "addLabels": ["github_actions"] + }, + { + "matchManagers": ["nuget"], + "addLabels": [".NET"] + }, + { + "matchManagers": ["pypi"], + "addLabels": ["python"] + }, + { + "description": ["Skip pinned NuGet package versions"], + "matchManagers": ["nuget"], + "matchCurrentValue": "^\\[[^,]+,\\)$", + "enabled": false + }, + { + "extends": ["monorepo:dotnet"], + "description": ["Disable major version updates for .NET"], + "matchUpdateTypes": ["major"], + "enabled": false + }, + { + "matchDepNames": ["xunit"], + "description": ["Disable major version updates for xunit"], + "matchUpdateTypes": ["major"], + "enabled": false + } + ], + "requireConfig": "required", + "schedule": ["* 8-17 * * 3"], + "timezone": "Etc/UTC", + "vulnerabilityAlerts": { + "addLabels": ["security"] + } +} diff --git a/Directory.Packages.props b/Directory.Packages.props index 44e4ca36443..5965ae5a2ae 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,13 +39,13 @@ - - - - - - - + + + + + + + - + - - - - - - + + + + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - - + + diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 5db72dd6a94..00000000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ] -} From 49ae6dd3ccce8788277bb568689332596df02232 Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Mon, 1 Sep 2025 13:17:49 +0100 Subject: [PATCH 3/6] [Infra] Remove requireConfig Not supported here. --- .github/renovate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index f57d0d2a4dc..d345478f509 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -52,7 +52,6 @@ "enabled": false } ], - "requireConfig": "required", "schedule": ["* 8-17 * * 3"], "timezone": "Etc/UTC", "vulnerabilityAlerts": { From 5cc14c46c1ccfa43c7aee08d7b6b8aaa368f9b3d Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Mon, 1 Sep 2025 13:51:37 +0100 Subject: [PATCH 4/6] [Infra] Revert some unpinning - Code analysers need extra work to upgrade. - Newer xunit packages do not support `net462`. --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5965ae5a2ae..c6e0e10d461 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -94,7 +94,7 @@ - + @@ -114,7 +114,7 @@ - + From 2d379a5b72472fb1e54e47611c5c426b8d7ec8ba Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Mon, 1 Sep 2025 13:52:22 +0100 Subject: [PATCH 5/6] [Infra] Fix package version Fix accidental downgrade. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c6e0e10d461..24c062f0098 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -89,7 +89,7 @@ - + From afbd51f68d94fe00eea8b007262dc256b797081a Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Wed, 10 Sep 2025 16:40:36 +0100 Subject: [PATCH 6/6] [Infra] Restore SemVer ranges Prevent use with 2.0/0.13. --- Directory.Packages.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e604ebc997a..8a221befdb9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,13 +39,13 @@ - - - - - - - + + + + + + +