@@ -23,9 +23,9 @@ ifeq ($(CI),true)
2323 $(shell git config --global --add safe.directory '*')
2424endif
2525
26- GO_INSTALL = ./ hack/go-install.sh
27-
28- TOOLS_DIR = hack/tools
26+ TOOLS_DIR = hack/tools
27+ export UGET_DIRECTORY = $( TOOLS_DIR )
28+ export UGET_CHECKSUMS = hack/tools.checksums
2929ROOT_DIR =$(abspath .)
3030TOOLS_GOBIN_DIR := $(abspath $(TOOLS_DIR ) )
3131GOBIN_DIR =$(abspath ./bin)
@@ -42,30 +42,30 @@ endif
4242
4343CONTROLLER_GEN_VER := v0.17.3
4444CONTROLLER_GEN_BIN := controller-gen
45- CONTROLLER_GEN := $(TOOLS_DIR ) /$(CONTROLLER_GEN_BIN ) - $( CONTROLLER_GEN_VER )
45+ CONTROLLER_GEN := $(TOOLS_DIR ) /$(CONTROLLER_GEN_BIN )
4646export CONTROLLER_GEN # so hack scripts can use it
4747
4848YAML_PATCH_VER ?= v0.0.11
4949YAML_PATCH_BIN := yaml-patch
50- YAML_PATCH := $(TOOLS_DIR ) /$(YAML_PATCH_BIN ) - $( YAML_PATCH_VER )
50+ YAML_PATCH := $(TOOLS_DIR ) /$(YAML_PATCH_BIN )
5151export YAML_PATCH # so hack scripts can use it
5252
53- GOLANGCI_LINT_VER := v2 .1.6
53+ GOLANGCI_LINT_VER := 2 .1.6
5454GOLANGCI_LINT_BIN := golangci-lint
55- GOLANGCI_LINT := $(TOOLS_GOBIN_DIR ) /$(GOLANGCI_LINT_BIN ) - $( GOLANGCI_LINT_VER )
55+ GOLANGCI_LINT := $(TOOLS_GOBIN_DIR ) /$(GOLANGCI_LINT_BIN )
5656GOLANGCI_LINT_FLAGS ?=
5757
58- HTTEST_VER := v0 .3.2
58+ HTTEST_VER := 0 .3.4
5959HTTEST_BIN := httest
60- HTTEST := $(TOOLS_GOBIN_DIR ) /$(HTTEST_BIN ) - $( HTTEST_VER )
60+ HTTEST := $(TOOLS_GOBIN_DIR ) /$(HTTEST_BIN )
6161
6262GOTESTSUM_VER := v1.12.3
6363GOTESTSUM_BIN := gotestsum
64- GOTESTSUM := $(abspath $(TOOLS_DIR ) ) /$(GOTESTSUM_BIN ) - $( GOTESTSUM_VER )
64+ GOTESTSUM := $(abspath $(TOOLS_DIR ) ) /$(GOTESTSUM_BIN )
6565
66- LOGCHECK_VER := v0.9.0
66+ LOGCHECK_VER := d35c84c015fe03a1421e5f2ce1e3c0c3bc38d077
6767LOGCHECK_BIN := logcheck
68- LOGCHECK := $(TOOLS_GOBIN_DIR ) /$(LOGCHECK_BIN ) - $( LOGCHECK_VER )
68+ LOGCHECK := $(TOOLS_GOBIN_DIR ) /$(LOGCHECK_BIN )
6969export LOGCHECK # so hack scripts can use it
7070
7171KCP_APIGEN_BIN := apigen
@@ -129,13 +129,22 @@ install: require-jq require-go require-git verify-go-versions ## Install the pro
129129.PHONY : install
130130
131131$(GOLANGCI_LINT ) :
132- GOBIN=$(TOOLS_GOBIN_DIR ) $(GO_INSTALL ) github.com/golangci/golangci-lint/v2/cmd/golangci-lint $(GOLANGCI_LINT_BIN ) $(GOLANGCI_LINT_VER )
132+ @hack/uget.sh \
133+ https://github.com/golangci/golangci-lint/releases/download/v{VERSION}/golangci-lint-{VERSION}-{GOOS}-{GOARCH}.tar.gz \
134+ ${GOLANGCI_LINT_BIN} \
135+ ${GOLANGCI_LINT_VER}
133136
134137$(HTTEST ) :
135- GOBIN=$(TOOLS_GOBIN_DIR ) $(GO_INSTALL ) go.xrstf.de/httest $(HTTEST_BIN ) $(HTTEST_VER )
138+ @hack/uget.sh \
139+ https://codeberg.org/xrstf/httest/releases/download/v{VERSION}/httest_{VERSION}_{GOOS}_{GOARCH}.tar.gz \
140+ ${HTTEST_BIN} \
141+ ${HTTEST_VER}
136142
137143$(LOGCHECK ) :
138- GOBIN=$(TOOLS_GOBIN_DIR ) $(GO_INSTALL ) sigs.k8s.io/logtools/logcheck $(LOGCHECK_BIN ) $(LOGCHECK_VER )
144+ @GO_MODULE=true hack/uget.sh \
145+ sigs.k8s.io/logtools/logcheck \
146+ ${LOGCHECK_BIN} \
147+ $(LOGCHECK_VER )
139148
140149$(KCP_APIGEN_GEN ) :
141150 pushd . && cd sdk && GOBIN=$(TOOLS_GOBIN_DIR ) go install ./cmd/apigen && popd
@@ -197,13 +206,13 @@ tools: $(GOLANGCI_LINT) $(HTTEST) $(CONTROLLER_GEN) $(KCP_APIGEN_GEN) $(YAML_PAT
197206.PHONY : tools
198207
199208$(CONTROLLER_GEN ) :
200- GOBIN= $( TOOLS_GOBIN_DIR ) $( GO_INSTALL ) sigs.k8s.io/controller-tools/cmd/controller-gen $( CONTROLLER_GEN_BIN ) $(CONTROLLER_GEN_VER )
209+ @GO_MODULE=true hack/uget.sh sigs.k8s.io/controller-tools/cmd/controller-gen ${ CONTROLLER_GEN_BIN} $(CONTROLLER_GEN_VER )
201210
202211$(YAML_PATCH ) :
203- GOBIN= $( TOOLS_GOBIN_DIR ) $( GO_INSTALL ) github.com/pivotal-cf/yaml-patch/cmd/yaml-patch $(YAML_PATCH_BIN ) $(YAML_PATCH_VER )
212+ @GO_MODULE=true hack/uget.sh github.com/pivotal-cf/yaml-patch/cmd/yaml-patch $(YAML_PATCH_BIN ) $(YAML_PATCH_VER )
204213
205214$(GOTESTSUM ) :
206- GOBIN= $( TOOLS_GOBIN_DIR ) $( GO_INSTALL ) gotest.tools/gotestsum $(GOTESTSUM_BIN ) $(GOTESTSUM_VER )
215+ @GO_MODULE=true hack/uget.sh gotest.tools/gotestsum $(GOTESTSUM_BIN ) $(GOTESTSUM_VER )
207216
208217crds : $(CONTROLLER_GEN ) $(YAML_PATCH ) # # Generate crds
209218 ./hack/update-codegen-crds.sh
0 commit comments