Skip to content

Commit b2c2bc7

Browse files
committed
use a script to download premade binaries instead of compiling them
On-behalf-of: @SAP [email protected]
1 parent fa4e118 commit b2c2bc7

File tree

4 files changed

+487
-80
lines changed

4 files changed

+487
-80
lines changed

Makefile

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ ifeq ($(CI),true)
2323
$(shell git config --global --add safe.directory '*')
2424
endif
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
2929
ROOT_DIR=$(abspath .)
3030
TOOLS_GOBIN_DIR := $(abspath $(TOOLS_DIR))
3131
GOBIN_DIR=$(abspath ./bin)
@@ -42,30 +42,30 @@ endif
4242

4343
CONTROLLER_GEN_VER := v0.17.3
4444
CONTROLLER_GEN_BIN := controller-gen
45-
CONTROLLER_GEN := $(TOOLS_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
45+
CONTROLLER_GEN := $(TOOLS_DIR)/$(CONTROLLER_GEN_BIN)
4646
export CONTROLLER_GEN # so hack scripts can use it
4747

4848
YAML_PATCH_VER ?= v0.0.11
4949
YAML_PATCH_BIN := yaml-patch
50-
YAML_PATCH := $(TOOLS_DIR)/$(YAML_PATCH_BIN)-$(YAML_PATCH_VER)
50+
YAML_PATCH := $(TOOLS_DIR)/$(YAML_PATCH_BIN)
5151
export YAML_PATCH # so hack scripts can use it
5252

53-
GOLANGCI_LINT_VER := v2.1.6
53+
GOLANGCI_LINT_VER := 2.1.6
5454
GOLANGCI_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)
5656
GOLANGCI_LINT_FLAGS ?=
5757

58-
HTTEST_VER := v0.3.2
58+
HTTEST_VER := 0.3.4
5959
HTTEST_BIN := httest
60-
HTTEST := $(TOOLS_GOBIN_DIR)/$(HTTEST_BIN)-$(HTTEST_VER)
60+
HTTEST := $(TOOLS_GOBIN_DIR)/$(HTTEST_BIN)
6161

6262
GOTESTSUM_VER := v1.12.3
6363
GOTESTSUM_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
6767
LOGCHECK_BIN := logcheck
68-
LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER)
68+
LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)
6969
export LOGCHECK # so hack scripts can use it
7070

7171
KCP_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

208217
crds: $(CONTROLLER_GEN) $(YAML_PATCH) ## Generate crds
209218
./hack/update-codegen-crds.sh

hack/go-install.sh

Lines changed: 0 additions & 62 deletions
This file was deleted.

hack/tools.checksums

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
controller-gen|GOARCH=amd64;GOOS=linux|cc3588262701701c3676fdf11094ccb5633650a2fc2cab9b237a0ea83214a75e
2+
controller-gen|GOARCH=arm64;GOOS=darwin|e44b122bfc0911d98db7d5f6129c08dfd3df4da1dc8692c4aef4a8bd903edfcf
3+
controller-gen|GOARCH=arm64;GOOS=linux|3514501d47db429950feaea34836ed59813c1f8421fbbbb8217884eb125c0cf7
4+
golangci-lint|GOARCH=amd64;GOOS=linux|7009324a8aad93c1f84dce1c3cf61181bdd6b68e5f1b8b5d6971662258255050
5+
golangci-lint|GOARCH=arm64;GOOS=darwin|96dc1dbbb686fc7982b9ea4b800f3d234a2d9fb78b0344f287e8d28ee11bc72b
6+
golangci-lint|GOARCH=arm64;GOOS=linux|c51ff5b21be688b043baea44de7dd855cf07b855c14f0de405bfaf922b1d7634
7+
gotestsum|GOARCH=amd64;GOOS=linux|137303fba7e9e7ee143a77b2c7e374c0f54b1dccc3796737b4fc253b0ae973cd
8+
gotestsum|GOARCH=arm64;GOOS=darwin|fc3b6b63d6cdbdb23646d996268c3157998482a913002f688486d2611f4ab1d3
9+
gotestsum|GOARCH=arm64;GOOS=linux|845c3693c5beef445a7814c6ca5f63ccb96585730c6348a02b4436696eba54c4
10+
httest|GOARCH=amd64;GOOS=linux|d524eea4fa0bcb9376466a6da7892d88556ed6c03d70f282946e5ca8474b4232
11+
httest|GOARCH=arm64;GOOS=darwin|12ac43f851459bc1e82302ff2d2bde987970c2c0a47933f79ddd3c277bf4a93d
12+
httest|GOARCH=arm64;GOOS=linux|6f317e0e9857a7582bbf881d30c8c64ead353312d3141b31cf1261de002d91ea
13+
logcheck|GOARCH=amd64;GOOS=linux|bab1a7d2c38fc1a8a9fb09ae86e1a50a4850225053a23899f03108eff9aa125c
14+
logcheck|GOARCH=arm64;GOOS=darwin|d1f46b265e13661a317a8df39f03c3c9cf50e46dee33503701645ebf570b4f5e
15+
logcheck|GOARCH=arm64;GOOS=linux|9453cda6d3e876912436ee065f34b600d407838c15d7e1b42f6c5c59d2fdf7e0
16+
yaml-patch|GOARCH=amd64;GOOS=linux|6eae938136a18a5730700676f89ce7a0d4a89d332219fad180202b329501a88b
17+
yaml-patch|GOARCH=arm64;GOOS=darwin|ce2f9448472b0e69e44c28c7e6879caae46664aa61e251fe7f181b78158ff9b0
18+
yaml-patch|GOARCH=arm64;GOOS=linux|f379170ba41d9d02446cbdf42fd48b47892a23f9333d9385ad8306449fc22d8b

0 commit comments

Comments
 (0)