@@ -20,15 +20,12 @@ PLATFORMS?=darwin linux windows freebsd
20
20
ARCHITECTURES? =amd64 arm64
21
21
GOBIN? =$(shell go env GOPATH) /bin
22
22
FORMATTER? =$(GOBIN ) /goimports
23
- GO_INSTALL = ./hack/go_install.sh
24
- TOOLS_DIR := hack/tools
25
- TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR ) /bin)
26
23
27
-
28
- # Binaries.
29
- GOLANGCI_LINT_VER := v1.49
30
- GOLANGCI_LINT_BIN := golangci-lint
31
- GOLANGCI_LINT := $( TOOLS_BIN_DIR ) / $( GOLANGCI_LINT_BIN ) - $( GOLANGCI_LINT_VER )
24
+ CRI =docker
25
+ CRI_COMMAND_BASE =${CRI} run --rm -u ${CURRENT_UID}:${CURRENT_GID} $( DOCKER_EXTRA_ARGS )
26
+ GOLANGCI_LINT_VERSION = v1.56
27
+ GOLANGCI_LINT_IMAGE = golangci/golangci -lint:${GOLANGCI_LINT_VERSION}
28
+ GOLANGCI_LINT =${CRI_COMMAND_BASE} -v $( CURDIR ) :/app -w /app -e GOLANGCI_LINT_CACHE=/tmp/.cache -e GOCACHE=/tmp/.cache ${GOLANGCI_LINT_IMAGE} golangci-lint
32
29
33
30
# Setup linker flags option for build that interoperate with variable names in src code
34
31
LDFLAGS? =-ldflags "-X $(PACKAGE_NAME ) /cmd.Version=$(VERSION ) -X $(PACKAGE_NAME ) /cmd.Build=$(BUILD ) "
@@ -42,7 +39,7 @@ fmt: $(FORMATTER)
42
39
$(FORMATTER ) :
43
40
go get golang.org/x/tools/cmd/goimports
44
41
45
- lint : $( GOLANGCI_LINT ) # # Lint codebase
42
+ lint : # # Lint codebase
46
43
$(GOLANGCI_LINT ) run -v --fast=false
47
44
48
45
build :
@@ -69,12 +66,3 @@ generate-docs: clean-docs
69
66
70
67
test :
71
68
go test -v ./... -timeout 1000s
72
-
73
-
74
- # # --------------------------------------
75
- # # Tooling Binaries
76
- # # --------------------------------------
77
-
78
- $(GOLANGCI_LINT ) : # # Build golangci-lint from tools folder.
79
- GOBIN=$(TOOLS_BIN_DIR ) $(GO_INSTALL ) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN ) $(GOLANGCI_LINT_VER )
80
- golangci-lint : $(LINTER )
0 commit comments