From 6f5cc6ea1e33cefd64d8a16808fcf677f7677454 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Thu, 23 Oct 2025 12:45:21 +0200 Subject: [PATCH] add verify-go-directive check from core CAPI --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c66cd3063..f8fc9d0fa 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ export GO111MODULE=on # Go version GOLANG_VERSION := 1.24.6 +GOLANG_DIRECTIVE_VERSION ?= 1.24.0 # Kubebuilder export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0 @@ -580,7 +581,7 @@ format-tiltfile: ## Format the Tiltfile. ./hack/verify-starlark.sh fix .PHONY: verify -verify: verify-boilerplate verify-modules verify-gen verify-shellcheck verify-tiltfile verify-conversions +verify: verify-boilerplate verify-modules verify-gen verify-shellcheck verify-tiltfile verify-conversions verify-go-directive .PHONY: verify-boilerplate verify-boilerplate: @@ -611,3 +612,9 @@ verify-gen: generate git diff HEAD; \ exit 1; \ fi + +.PHONY: verify-go-directive +verify-go-directive: + # use the core Cluster API script directly to verify the go directive matches the desired one. + # ref: https://github.com/kubernetes-sigs/cluster-api/blob/v1.10.7/hack/verify-go-directive.sh + curl --retry $(CURL_RETRIES) -fsL https://raw.githubusercontent.com/kubernetes-sigs/cluster-api/refs/tags/v1.11.0/hack/verify-go-directive.sh | bash -s -- -g $(GOLANG_DIRECTIVE_VERSION)