Update makego (#4624)

Author: pkwarren

make/go/bootstrap.mk

@@ -14,3 +14,7 @@ endef
 define _conditional_include
 	$(if $(filter $(1),$(MAKEFILE_LIST)),,$(eval include $(1)))
 endef
+# Extracts the major.minor (e.g. 1.26) from a dotted version string (e.g. 1.26.3).
+define _major_minor
+$(word 1,$(subst ., ,$(1))).$(word 2,$(subst ., ,$(1)))
+endef

make/go/dep_buf.mk

@@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 
 # Settable
-# https://github.com/bufbuild/buf/releases 20260525 checked 20260525
-BUF_VERSION ?= v1.70.0
+# https://github.com/bufbuild/buf/releases 20260717 checked 20260717
+BUF_VERSION ?= v1.72.0
 # Settable
 #
 # If set, this path will be installed every time someone depends on $(BUF)

make/go/dep_bufstyle.mk

@@ -10,7 +10,7 @@ $(call _assert_var,BUF_VERSION)
 
 # We want to ensure we rebuild bufstyle every time we require a new Go minor version.
 # Otherwise, the cached version may not support the latest language features.
-BUFSTYLE_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2)
+BUFSTYLE_GO_VERSION := $(call _major_minor,$(shell go list -m -f '{{.GoVersion}}'))
 
 # Settable
 # https://github.com/bufbuild/bufstyle-go/releases

make/go/dep_godoclint.mk

@@ -12,8 +12,8 @@ $(call _assert_var,BUF_VERSION)
 # Otherwise, the cached version may not support the latest language features.
 # This version is the go toolchain version (which may be more specific than the module
 # version) to ensure the build handles specific language features in newer toolchains.
-GODOCLINT_GOTOOLCHAIN_VERSION := $(shell go env GOVERSION | sed 's/^go//')
-GODOCLINT_GO_VERSION := $(shell echo $(GODOCLINT_GOTOOLCHAIN_VERSION) | cut -d'.' -f1-2)
+GODOCLINT_GOTOOLCHAIN_VERSION := $(patsubst go%,%,$(shell go env GOVERSION))
+GODOCLINT_GO_VERSION := $(call _major_minor,$(GODOCLINT_GOTOOLCHAIN_VERSION))
 
 # Settable
 #

make/go/dep_govulncheck.mk

@@ -10,12 +10,12 @@ $(call _assert_var,CACHE_BIN)
 # Otherwise, the cached version may not support the latest language features.
 # This version is the go toolchain version (which may be more specific than the module
 # version) to ensure the build handles specific language features in newer toolchains.
-GOVULNCHECK_GOTOOLCHAIN_VERSION := $(shell go env GOVERSION | sed 's/^go//')
-GOVULNCHECK_GO_VERSION := $(shell echo $(GOVULNCHECK_GOTOOLCHAIN_VERSION) | cut -d'.' -f1-2)
+GOVULNCHECK_GOTOOLCHAIN_VERSION := $(patsubst go%,%,$(shell go env GOVERSION))
+GOVULNCHECK_GO_VERSION := $(call _major_minor,$(GOVULNCHECK_GOTOOLCHAIN_VERSION))
 
 # Settable
-# https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck 20260410 checked 20260422
-GOVULNCHECK_VERSION ?= v1.2.0
+# https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck 20260625 checked 20260625
+GOVULNCHECK_VERSION ?= v1.5.0
 
 GOVULNCHECK := $(CACHE_BIN)/govulncheck
 

make/go/go.mk

@@ -87,6 +87,9 @@ ci:
 	@$(MAKE) lint
 	@$(MAKE) test
 
+.PHONY: preupgradegodeps
+preupgradegodeps::
+
 .PHONY: postupgradegodeps
 postupgradegodeps::
 
@@ -98,6 +101,7 @@ upgradegodeps:
 ifneq ($(GO_MOD_TOOLCHAIN),)
 	go mod edit -toolchain=go$(GO_MOD_TOOLCHAIN)
 endif
+	@$(MAKE) preupgradegodeps
 ifneq ($(GO_GET_PKGS),)
 	go get $(GO_GET_PKGS)
 endif
@@ -172,8 +176,12 @@ endif
 
 .PHONY: govulncheck
 govulncheck: $(GOVULNCHECK)
+ifneq ($(SKIP_GOVULNCHECK),)
+	@echo Skipping govulncheck...
+else
 	@echo govulncheck GOPKGS
 	@govulncheck $(GOPKGS)
+endif
 
 .PHONY: postlint
 postlint::