diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 72c8ead1e7b..5583f8601cc 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -15,6 +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 @@ -212,11 +213,16 @@ } }, { + // main branch is using the new toolchain directive "groupName": "Go", "matchPackageNames": [ "go", "docker.io/library/golang" ], + "matchBaseBranches": [ + "v1.0", + "v1.1", + ], // postUpgradeTasks is only for when the Go module directives are bumped "postUpgradeTasks": { // We need to trigger a golang install manually here because in some @@ -227,6 +233,27 @@ "executionMode": "branch" }, }, + { + // stable branches are using the go directive + "groupName": "Go", + "matchPackageNames": [ + "go", + "docker.io/library/golang" + ], + "matchBaseBranches": [ + "v1.0", + "v1.1", + ], + // postUpgradeTasks is only for when the Go module directives are bumped + "postUpgradeTasks": { + // 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"], + "fileFilters": ["**/**"], + "executionMode": "branch" + }, + }, { // Group golangci-lint updates to overrule grouping of version updates in // the GHA files. Without this, golangci-lint updates are not in sync for