improve staging modules

On-behalf-of: @SAP [email protected]

Author: xrstf

Makefile

@@ -128,6 +128,9 @@ install: require-jq require-go require-git verify-go-versions ## Install the pro
   	done
 .PHONY: install
 
+golangci-lint: $(GOLANGCI_LINT)
+.PHONY: golangci-lint
+
 $(GOLANGCI_LINT):
 	@hack/uget.sh \
 		https://github.com/golangci/golangci-lint/releases/download/v{VERSION}/golangci-lint-{VERSION}-{GOOS}-{GOARCH}.tar.gz \

staging/src/github.com/kcp-dev/client-go/Makefile

@@ -17,22 +17,17 @@ SHELL := /usr/bin/env bash -e
 
 KCP_ROOT_DIR ?= $(abspath ../../../../..)
 
-GO_INSTALL = $(KCP_ROOT_DIR)/hack/go-install.sh
-
-TOOLS_DIR=hack/tools
+TOOLS_DIR = hack/tools
 TOOLS_GOBIN_DIR := $(KCP_ROOT_DIR)/$(TOOLS_DIR)
-GOBIN_DIR=$(abspath ./bin)
-PATH := $(GOBIN_DIR):$(TOOLS_GOBIN_DIR):$(PATH)
+PATH := $(TOOLS_GOBIN_DIR):$(PATH)
 
-GOLANGCI_LINT_VER := v2.1.6
 GOLANGCI_LINT_BIN := golangci-lint
-GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
-GOLANGCI_LINT_FLAGS ?=
+GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)
 
 $(GOLANGCI_LINT):
-	GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/v2/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
+	make -C ../../../../.. $(GOLANGCI_LINT_BIN)
 
-tools: $(CODE_GENERATOR)
+tools: $(CODE_GENERATOR) $(GOLANGCI_LINT)
 .PHONY: tools
 
 codegen:

staging/src/github.com/kcp-dev/code-generator/Makefile

@@ -15,23 +15,22 @@
 SHELL := /usr/bin/env bash
 
 KCP_ROOT_DIR ?= $(abspath ../../../../..)
-
-GO_INSTALL = $(KCP_ROOT_DIR)/hack/go-install.sh
+UGET = $(KCP_ROOT_DIR)/hack/uget.sh
 
 BUILD_DEST ?= _build
 BUILDFLAGS ?=
 CMD ?= $(notdir $(wildcard ./cmd/*))
 
-TOOLS_DIR=hack/tools
-GOBIN_DIR := $(KCP_ROOT_DIR)/$(TOOLS_DIR)
-TMPDIR := $(shell mktemp -d)
+TOOLS_DIR = hack/tools
+export UGET_DIRECTORY = $(TOOLS_DIR)
+export UGET_CHECKSUMS = hack/tools.checksums
+TOOLS_GOBIN_DIR := $(KCP_ROOT_DIR)/$(TOOLS_DIR)
 
-GOLANGCI_LINT_VER := v2.1.6
 GOLANGCI_LINT_BIN := golangci-lint
-GOLANGCI_LINT := $(GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
+GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)
 
 $(GOLANGCI_LINT):
-	GOBIN=$(GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
+	make -C ../../../../.. $(GOLANGCI_LINT_BIN)
 
 .PHONY: imports
 imports: WHAT ?=