From 9577d4e7ef105b46c916ff9ba2bd41077f3d9d72 Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Mon, 16 Feb 2026 23:48:48 +0100 Subject: [PATCH 1/2] Fix govuln version to toolchain version --- make/go/dep_govulncheck.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/go/dep_govulncheck.mk b/make/go/dep_govulncheck.mk index ad11e44..7ff566f 100644 --- a/make/go/dep_govulncheck.mk +++ b/make/go/dep_govulncheck.mk @@ -8,7 +8,7 @@ $(call _assert_var,CACHE_BIN) # We want to ensure we rebuild govulncheck every time we require a new Go minor version. # Otherwise, the cached version may not support the latest language features. -GOVULNCHECK_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2) +GOVULNCHECK_GO_VERSION := $(shell go env GOVERSION | sed 's/^go//' | cut -d'.' -f1-2) # Settable # https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck 20250106 checked 20250212 From c053459890b36652d4bfb79f1e11441b8c753a27 Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Tue, 17 Feb 2026 15:19:08 +0100 Subject: [PATCH 2/2] Doc change --- make/go/dep_govulncheck.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/make/go/dep_govulncheck.mk b/make/go/dep_govulncheck.mk index 7ff566f..4598f12 100644 --- a/make/go/dep_govulncheck.mk +++ b/make/go/dep_govulncheck.mk @@ -8,6 +8,8 @@ $(call _assert_var,CACHE_BIN) # We want to ensure we rebuild govulncheck every time we require a new Go minor version. # Otherwise, the cached version may not support the latest language features. +# This version is the go toolchain version not the module version to ensure +# the build handles specific language features in newer toolchains. GOVULNCHECK_GO_VERSION := $(shell go env GOVERSION | sed 's/^go//' | cut -d'.' -f1-2) # Settable