mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile: use 'go env gopath' as install target for tools (as per request #445)

Browse Source
This commit is contained in:
iwilltry42 2021-04-15 13:57:33 +02:00
parent f2af514929
commit a1ebb447b0
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -60,6 +60,7 @@ K3D_HELPER_VERSION ?=
# Go options # Go options
GO ?= go GO ?= go
GOENVPATH := $(shell go env GOPATH)
PKG := $(shell go mod vendor) PKG := $(shell go mod vendor)
TAGS := TAGS :=
TESTS := ./... TESTS := ./...
@ -83,7 +84,7 @@ GO_SRC += $(foreach dir,$(REC_DIRS),$(shell find $(dir) -name "*.go"))
########## Required Tools ########## ########## Required Tools ##########
# Go Package required # Go Package required
PKG_GOX := github.com/mitchellh/gox@v1.0.1 PKG_GOX := github.com/mitchellh/gox@v1.0.1
PKG_GOLANGCI_LINT_VERSION := 1.31.0 PKG_GOLANGCI_LINT_VERSION := 1.39.0
PKG_GOLANGCI_LINT_SCRIPT := https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh PKG_GOLANGCI_LINT_SCRIPT := https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh
PKG_GOLANGCI_LINT := github.com/golangci/golangci-lint/cmd/golangci-lint@v${PKG_GOLANGCI_LINT_VERSION} PKG_GOLANGCI_LINT := github.com/golangci/golangci-lint/cmd/golangci-lint@v${PKG_GOLANGCI_LINT_VERSION}
@ -196,13 +197,13 @@ ifndef HAS_GOX
($(GO) get $(PKG_GOX)) ($(GO) get $(PKG_GOX))
endif endif
ifndef HAS_GOLANGCI ifndef HAS_GOLANGCI
(curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b ${GOPATH}/bin v${PKG_GOLANGCI_LINT_VERSION}) (curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b $(GOENVPATH)/bin v${PKG_GOLANGCI_LINT_VERSION})
endif endif
ifdef HAS_GOLANGCI ifdef HAS_GOLANGCI
ifeq ($(HAS_GOLANGCI_VERSION),) ifeq ($(HAS_GOLANGCI_VERSION),)
ifdef INTERACTIVE ifdef INTERACTIVE
@echo "Warning: Your installed version of golangci-lint (interactive: ${INTERACTIVE}) differs from what we'd like to use. Switch to v${PKG_GOLANGCI_LINT_VERSION}? [Y/n]" @echo "Warning: Your installed version of golangci-lint (interactive: ${INTERACTIVE}) differs from what we'd like to use. Switch to v${PKG_GOLANGCI_LINT_VERSION}? [Y/n]"
@read line; if [ $$line == "y" ]; then (curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b ${GOPATH}/bin v${PKG_GOLANGCI_LINT_VERSION}); fi @read line; if [ $$line == "y" ]; then (curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b $(GOENVPATH)/bin v${PKG_GOLANGCI_LINT_VERSION}); fi
else else
@echo "Warning: you're not using the same version of golangci-lint as us (v${PKG_GOLANGCI_LINT_VERSION})" @echo "Warning: you're not using the same version of golangci-lint as us (v${PKG_GOLANGCI_LINT_VERSION})"
endif endif
@ -215,7 +216,7 @@ endif
# - kubectl for E2E-tests (e2e) # - kubectl for E2E-tests (e2e)
ci-setup: ci-setup:
@echo "Installing Go tools..." @echo "Installing Go tools..."
curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b ${GOPATH}/bin v$(PKG_GOLANGCI_LINT_VERSION) curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b $(GOENVPATH)/bin v$(PKG_GOLANGCI_LINT_VERSION)
$(GO) get $(PKG_GOX) $(GO) get $(PKG_GOX)
@echo "Installing kubectl..." @echo "Installing kubectl..."