From bee5a74c9e233d379ff912f0db5182ac01f828af Mon Sep 17 00:00:00 2001 From: Mahe Tardy Date: Fri, 31 May 2024 12:48:59 +0200 Subject: [PATCH] renovate: switch to get Go version from toolchain directive Since we now use the toolchain as the version we should use because of #2425, renovate need to pick up the toolchain version for its Go install fix. Signed-off-by: Mahe Tardy --- .github/renovate.json5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a9cccb9cf11..2bf440ab423 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -15,7 +15,7 @@ "^make vendor$", "^make -C install/kubernetes$", "^go mod vendor$", - "^install-tool golang \\$\\(grep -oP '\\^go \\\\K\\.\\+' go\\.mod\\)$" + "^install-tool golang \\$\\(grep -oP '\\^toolchain go\\\\K\\.\\+' go\\.mod\\)$" ], // repository configuration "$schema": "https://docs.renovatebot.com/renovate-schema.json", @@ -222,7 +222,7 @@ // We need to trigger a golang install manually here because in some // cases it might not be preinstalled, see: // https://github.com/renovatebot/renovate/discussions/23485 - "commands": ["install-tool golang $(grep -oP '^go \\K.+' go.mod)", "make vendor"], + "commands": ["install-tool golang $(grep -oP '^toolchain go\\K.+' go.mod)", "make vendor"], "fileFilters": ["**/**"], "executionMode": "branch" },