From 5d6cf4ac2ad3dc086d0dd40298a8bad80fd78dc2 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@ibm.com>
Date: Thu, 3 Apr 2025 13:06:16 +0200
Subject: [PATCH] ci: use Go version from build.env for golangci-lint

Signed-off-by: Niels de Vos <ndevos@ibm.com>
---
 Makefile                | 2 ++
 scripts/golangci.yml.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 7d5bc994c..4eabc68e0 100644
--- a/Makefile
+++ b/Makefile
@@ -117,12 +117,14 @@ mod-check: check-env
 	done
 	test -z "$(shell git status --short)" || (echo "files were modified during go mod checks: " ; git status --short ; false)
 
+scripts/golangci.yml: GOVERSION ?= $(shell . $(CURDIR)/build.env ; echo go$${GOLANG_VERSION})
 scripts/golangci.yml: scripts/golangci.yml.in
 	rm -f scripts/golangci.yml.buildtags.in
 	for tag in $(GO_TAGS_LIST); do \
 		echo "    - $$tag" >> scripts/golangci.yml.buildtags.in ; \
 	done
 	sed "/@@BUILD_TAGS@@/r scripts/golangci.yml.buildtags.in" scripts/golangci.yml.in | sed '/@@BUILD_TAGS@@/d' > scripts/golangci.yml
+	sed "s/@@GOVERSION@@/$(GOVERSION)/" -i scripts/golangci.yml
 
 go-lint: scripts/golangci.yml
 	./scripts/lint-go.sh
diff --git a/scripts/golangci.yml.in b/scripts/golangci.yml.in
index a0bcba726..062eb1fa6 100644
--- a/scripts/golangci.yml.in
+++ b/scripts/golangci.yml.in
@@ -8,6 +8,8 @@ run:
   build-tags:
 @@BUILD_TAGS@@
 
+  go: '@@GOVERSION@@'
+
   # default concurrency is a available CPU number
   concurrency: 4