summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile30
1 files changed, 7 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 3530b73c9..a02706eaf 100644
--- a/Makefile
+++ b/Makefile
@@ -148,12 +148,10 @@ ifeq ("$(wildcard $(GOPKGDIR))","")
endif
touch $@
-lint: .gopathok varlink_generate ## Execute the source code linter
- @echo "checking lint"
- @./.tool/lint
+lint: golangci-lint
golangci-lint: .gopathok varlink_generate .install.golangci-lint
- $(GOBIN)/golangci-lint run --tests=false --skip-files swagger.go
+ $(GOBIN)/golangci-lint run
gofmt: ## Verify the source code gofmt
find . -name '*.go' ! -path './vendor/*' -exec gofmt -s -w {} \+
@@ -314,12 +312,6 @@ remotesystem:
system.test-binary: .install.ginkgo
$(GO) test -c ./test/system
-perftest: ## Build perf tests
- $ cd contrib/perftest;go build
-
-run-perftest: perftest ## Build and run perf tests
- $ contrib/perftest/perftest
-
vagrant-check:
BOX=$(BOX) sh ./vagrant.sh
@@ -351,6 +343,9 @@ install-podman-remote-%-docs: podman-remote docs $(MANPAGES)
man-page-check:
hack/man-page-checker
+codespell:
+ codespell -S bin,vendor,.git,go.sum,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked
+
# When publishing releases include critical build-time details
.PHONY: release.txt
release.txt:
@@ -486,7 +481,7 @@ uninstall:
GIT_CHECK_EXCLUDE="./vendor:docs/make.bat" $(GOBIN)/git-validation -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..$(HEAD)
.PHONY: install.tools
-install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo .install.golangci-lint ## Install needed tools
+install.tools: .install.gitvalidation .install.md2man .install.ginkgo .install.golangci-lint ## Install needed tools
define go-get
env GO111MODULE=off \
@@ -503,19 +498,8 @@ endef
$(call go-get,github.com/vbatts/git-validation); \
fi
-.install.gometalinter: .gopathok
- if [ ! -x "$(GOBIN)/gometalinter" ]; then \
- $(call go-get,github.com/alecthomas/gometalinter); \
- cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \
- git checkout --detach e8d801238da6f0dfd14078d68f9b53fa50a7eeb5; \
- $(GO) install github.com/alecthomas/gometalinter; \
- $(GOBIN)/gometalinter --install; \
- fi
-
.install.golangci-lint: .gopathok
- if [ ! -x "$(GOBIN)/golangci-lint" ]; then \
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOBIN)/ v1.17.1; \
- fi
+ VERSION=1.18.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh
.install.md2man: .gopathok
if [ ! -x "$(GOMD2MAN)" ]; then \