Skip to content

use a script to download premade binaries instead of compiling them #3692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+683 −100
Open

use a script to download premade binaries instead of compiling them #3692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aae201d
use a script to download premade binaries instead of compiling them
xrstf Oct 31, 2025
5a02126
improve staging modules
xrstf Oct 31, 2025
7c189fb
update to µget 0.2.2
xrstf Nov 4, 2025
2c26c7a
use binaries for controller-gen
xrstf Nov 5, 2025
6dfddb1
upgrade µget to 0.3, adding posix compatibility
xrstf Nov 6, 2025
cee7843
mark these targets as PHONY because µget cannot (yet?) handle binarie…
xrstf Nov 6, 2025
5458bf8
update µget to 0.3.2 to make usage more comfortable
xrstf Nov 6, 2025
b9fd216
upgrade to µget 0.3.3, which can handle binaries with versions
xrstf Nov 6, 2025
55f22c0
fix tests not finding httest anymore
xrstf Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ ifeq ($(CI),true)
$(shell git config --global --add safe.directory '*')
endif

GO_INSTALL = ./hack/go-install.sh

TOOLS_DIR=hack/tools
TOOLS_DIR = hack/tools
export UGET_DIRECTORY = $(TOOLS_DIR)
export UGET_CHECKSUMS = hack/tools.checksums
export UGET_VERSIONED_BINARIES = true
ROOT_DIR=$(abspath .)
TOOLS_GOBIN_DIR := $(abspath $(TOOLS_DIR))
GOBIN_DIR=$(abspath ./bin)
Expand All @@ -50,20 +51,20 @@ YAML_PATCH_BIN := yaml-patch
YAML_PATCH := $(TOOLS_DIR)/$(YAML_PATCH_BIN)-$(YAML_PATCH_VER)
export YAML_PATCH # so hack scripts can use it

GOLANGCI_LINT_VER := v2.1.6
GOLANGCI_LINT_VER := 2.1.6
GOLANGCI_LINT_BIN := golangci-lint
GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
GOLANGCI_LINT_FLAGS ?=

HTTEST_VER := v0.3.2
HTTEST_VER := 0.3.4
HTTEST_BIN := httest
HTTEST := $(TOOLS_GOBIN_DIR)/$(HTTEST_BIN)-$(HTTEST_VER)
export HTTEST := $(TOOLS_GOBIN_DIR)/$(HTTEST_BIN)-$(HTTEST_VER)

GOTESTSUM_VER := v1.12.3
GOTESTSUM_VER := 1.12.3
GOTESTSUM_BIN := gotestsum
GOTESTSUM := $(abspath $(TOOLS_DIR))/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)

LOGCHECK_VER := v0.9.0
LOGCHECK_VER := d35c84c015fe03a1421e5f2ce1e3c0c3bc38d077
LOGCHECK_BIN := logcheck
LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER)
export LOGCHECK # so hack scripts can use it
Expand Down Expand Up @@ -129,14 +130,29 @@ install: require-jq require-go require-git verify-go-versions ## Install the pro
.PHONY: install

$(GOLANGCI_LINT):
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/v2/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
@hack/uget.sh \
https://github.com/golangci/golangci-lint/releases/download/v{VERSION}/golangci-lint-{VERSION}-{GOOS}-{GOARCH}.tar.gz \
${GOLANGCI_LINT_BIN} \
${GOLANGCI_LINT_VER}

# help staging modules to install the same linter version
golangci-lint-version:
@echo $(GOLANGCI_LINT_VER)
.PHONY: golangci-lint-version

$(HTTEST):
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) go.xrstf.de/httest $(HTTEST_BIN) $(HTTEST_VER)
@hack/uget.sh \
https://codeberg.org/xrstf/httest/releases/download/v{VERSION}/httest_{VERSION}_{GOOS}_{GOARCH}.tar.gz \
${HTTEST_BIN} \
${HTTEST_VER}

$(LOGCHECK):
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) sigs.k8s.io/logtools/logcheck $(LOGCHECK_BIN) $(LOGCHECK_VER)
@GO_MODULE=true hack/uget.sh \
sigs.k8s.io/logtools/logcheck \
${LOGCHECK_BIN} \
$(LOGCHECK_VER)

.PHONY: $(KCP_APIGEN_GEN)
$(KCP_APIGEN_GEN):
pushd . && cd staging/src/github.com/kcp-dev/sdk && GOBIN=$(TOOLS_GOBIN_DIR) go install ./cmd/apigen && popd

Expand Down Expand Up @@ -197,13 +213,17 @@ tools: $(GOLANGCI_LINT) $(HTTEST) $(CONTROLLER_GEN) $(KCP_APIGEN_GEN) $(YAML_PAT
.PHONY: tools

$(CONTROLLER_GEN):
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER)
@UNCOMPRESSED=true hack/uget.sh https://github.com/kubernetes-sigs/controller-tools/releases/download/{VERSION}/controller-gen-{GOOS}-{GOARCH} ${CONTROLLER_GEN_BIN} $(CONTROLLER_GEN_VER) controller-gen*

$(YAML_PATCH):
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/pivotal-cf/yaml-patch/cmd/yaml-patch $(YAML_PATCH_BIN) $(YAML_PATCH_VER)
@GO_MODULE=true hack/uget.sh github.com/pivotal-cf/yaml-patch/cmd/yaml-patch $(YAML_PATCH_BIN) $(YAML_PATCH_VER)

$(GOTESTSUM):
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) gotest.tools/gotestsum $(GOTESTSUM_BIN) $(GOTESTSUM_VER)
@hack/uget.sh \
https://github.com/gotestyourself/gotestsum/releases/download/v{VERSION}/gotestsum_{VERSION}_{GOOS}_{GOARCH}.tar.gz \
${GOTESTSUM_BIN} \
${GOTESTSUM_VER} \
${GOTESTSUM_BIN}

crds: $(CONTROLLER_GEN) $(YAML_PATCH) ## Generate crds
./hack/update-codegen-crds.sh
Expand Down Expand Up @@ -267,7 +287,7 @@ BOILERPLATE_KUBERNETES_FILES := $(abspath ./hack/boilerplate/boilerplate_kuberne

.PHONY: verify-boilerplate
verify-boilerplate: ## Verify boilerplate
hack/verify_boilerplate.py --boilerplate-dir=hack/boilerplate --skip docs/venv --skip pkg/network/dialer --skip-files-list $(BOILERPLATE_MODIFIED_FILES) --skip-files-list $(BOILERPLATE_KUBERNETES_FILES)
hack/verify_boilerplate.py --boilerplate-dir=hack/boilerplate --skip hack/uget.sh --skip docs/venv --skip pkg/network/dialer --skip-files-list $(BOILERPLATE_MODIFIED_FILES) --skip-files-list $(BOILERPLATE_KUBERNETES_FILES)
hack/verify_boilerplate.py --boilerplate-dir=hack/boilerplate/boilerplate_modified --filenames-list $(BOILERPLATE_MODIFIED_FILES)
hack/verify_boilerplate.py --boilerplate-dir=hack/boilerplate/boilerplate_kubernetes --filenames-list $(BOILERPLATE_KUBERNETES_FILES)

Expand Down
62 changes: 0 additions & 62 deletions hack/go-install.sh
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions hack/tools.checksums
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
controller-gen|GOARCH=amd64;GOOS=linux|21e5f3239666fc0c5e2d23c2a3a83fd655af40a969ede7a118b86832c35a829f
controller-gen|GOARCH=arm64;GOOS=darwin|2ca28be7185d9279ed82e3355529b0543938f392cb812add3f25a62196ed7441
controller-gen|GOARCH=arm64;GOOS=linux|a1a1f758435d05933c4b2f8c292f8ab2448e81a02c45f14dbd81c10e87ec4b20
golangci-lint|GOARCH=amd64;GOOS=linux|7009324a8aad93c1f84dce1c3cf61181bdd6b68e5f1b8b5d6971662258255050
golangci-lint|GOARCH=arm64;GOOS=darwin|96dc1dbbb686fc7982b9ea4b800f3d234a2d9fb78b0344f287e8d28ee11bc72b
golangci-lint|GOARCH=arm64;GOOS=linux|c51ff5b21be688b043baea44de7dd855cf07b855c14f0de405bfaf922b1d7634
gotestsum|GOARCH=amd64;GOOS=linux|2e505a9368568aa7422e0a90ef77acc8807c0d3272ab81c7a69e3e8688d1cf65
gotestsum|GOARCH=arm64;GOOS=darwin|020be8d14358c7ac4155e296436057cf4b1f1232f8f8f3d71f22a0e7a5504340
gotestsum|GOARCH=arm64;GOOS=linux|2f8517768c2831750cb372e379404a059dbd20f2b1f79bcc235c4cab4540cb10
httest|GOARCH=amd64;GOOS=linux|d524eea4fa0bcb9376466a6da7892d88556ed6c03d70f282946e5ca8474b4232
httest|GOARCH=arm64;GOOS=darwin|12ac43f851459bc1e82302ff2d2bde987970c2c0a47933f79ddd3c277bf4a93d
httest|GOARCH=arm64;GOOS=linux|6f317e0e9857a7582bbf881d30c8c64ead353312d3141b31cf1261de002d91ea
yaml-patch|GOARCH=amd64;GOOS=linux|6eae938136a18a5730700676f89ce7a0d4a89d332219fad180202b329501a88b
yaml-patch|GOARCH=arm64;GOOS=darwin|ce2f9448472b0e69e44c28c7e6879caae46664aa61e251fe7f181b78158ff9b0
yaml-patch|GOARCH=arm64;GOOS=linux|f379170ba41d9d02446cbdf42fd48b47892a23f9333d9385ad8306449fc22d8b
Loading