From 795562763077404e95b5f4c2a4703a4e8e22e240 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Wed, 7 May 2025 08:24:14 +0000 Subject: [PATCH] ci: enable Renovate on `main` and `20.0.x` branches (#61160) Dependency updates can no longer be cherry-picked due to hash changes in Aspect lock files. This commit enables Renovate to run directly on the `main` and `20.0.x` branches. PR Close #61160 --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 6ea3b33fb84..870628fef03 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "baseBranches": ["main"], + "baseBranches": ["main", "20.0.x"], "enabledManagers": ["npm", "bazel", "github-actions", "nvm"], "rangeStrategy": "replace", "pinDigests": true, @@ -15,7 +15,7 @@ "lockFileMaintenance": { "enabled": true }, - "labels": ["target: patch", "area: build & ci", "action: merge"], + "labels": ["area: build & ci", "action: merge"], "postUpgradeTasks": { "commands": [ "git restore .yarn/releases/yarn-1.22.22.cjs pnpm-lock.yaml",