From 4c5d5578c18afeb203d31ebbf56df12f7f54ec67 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Tue, 2 Jun 2020 11:47:52 +0200 Subject: [PATCH] bring back staticcheck --- .drone.star | 4 ++-- .golangci.yml | 32 -------------------------------- Makefile | 4 ++++ 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 .golangci.yml diff --git a/.drone.star b/.drone.star index dfd94a89f..296e37aa6 100644 --- a/.drone.star +++ b/.drone.star @@ -62,10 +62,10 @@ def testing(ctx): }, { 'name': 'staticcheck', - 'image': 'golangci/golangci-lint:latest', + 'image': 'webhippie/golang:1.13', 'pull': 'always', 'commands': [ - 'golangci-lint run --timeout 30s', + 'make staticcheck', ], 'volumes': [ { diff --git a/.golangci.yml b/.golangci.yml deleted file mode 100644 index 06021130b..000000000 --- a/.golangci.yml +++ /dev/null @@ -1,32 +0,0 @@ -linters: - enable: - - bodyclose - - deadcode - - errcheck - - gosimple - - govet - - ineffassign - - staticcheck - - structcheck - - typecheck - - unused - - varcheck - - depguard - - golint - - goimports - - unconvert - - scopelint - - maligned - - misspell - - gocritic - - prealloc - - gosec - - rowserrcheck - - goconst - - gocyclo - - maligned - - unparam - - goprintffuncname - - nestif - - nolintlint - # - gomnd diff --git a/Makefile b/Makefile index a11e8df28..cda937590 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,10 @@ $(BIN)/$(EXECUTABLE)-debug: $(SOURCES) $(BIN)/$(EXECUTABLE)-linux: $(SOURCES) GOOS=linux GOARCH=amd64 $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -gcflags '$(GCFLAGS)' -o $@ ./cmd/$(NAME) +.PHONY: staticcheck +staticcheck: + go run honnef.co/go/tools/cmd/staticcheck -tags '$(TAGS)' $(PACKAGES) + .PHONY: release release: release-dirs release-linux release-windows release-darwin release-copy release-check