diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | Makefile | 12 |
3 files changed, 8 insertions, 8 deletions
@@ -4,7 +4,7 @@ bin/protoc bin/golint bin/protoc-gen-go bin/goimports -bin/megacheck +bin/staticcheck bin/gocovmerge bin/misspell *coverage.out diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f516829..69a5ce6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -151,5 +151,5 @@ your code. `make lint` runs: - [`go vet`](https://golang.org/cmd/vet/) - [`golint`](https://github.com/golang/lint) (built from source in `vendor/`) - - [`megacheck`](https://github.com/dominikh/go-tools/tree/master/cmd/megacheck) + - [`staticcheck`](https://github.com/dominikh/go-tools/tree/master/cmd/staticcheck) (built from source in `vendor/`) @@ -98,10 +98,10 @@ format: $(BIN)/goimports goimports -w $(GO_DIRS) clang-format -i -style=Google $(C_FILES) -lint: $(BIN)/golint $(BIN)/megacheck +lint: $(BIN)/golint $(BIN)/staticcheck $(BIN)/misspell go vet ./... go list ./... | xargs -L1 golint -set_exit_status - megacheck -unused.exported -simple.exit-non-zero ./... + staticcheck ./... misspell -source=text $(FILES) clean: @@ -163,7 +163,7 @@ uninstall: rm -f $(DESTDIR)/$(NAME) $(PAM_MODULE_DIR)/$(PAM_MODULE) $(PAM_CONFIG_DIR)/$(NAME) #### Tool Building Commands #### -TOOLS := $(addprefix $(BIN)/,protoc golint protoc-gen-go goimports megacheck gocovmerge misspell) +TOOLS := $(addprefix $(BIN)/,protoc golint protoc-gen-go goimports staticcheck gocovmerge misspell) .PHONY: tools tools: $(TOOLS) @@ -178,9 +178,9 @@ $(BIN)/protoc-gen-go: $(BIN)/goimports: GO111MODULE=off go get golang.org/x/tools/cmd/goimports GO111MODULE=off go build -o $@ golang.org/x/tools/cmd/goimports -$(BIN)/megacheck: - GO111MODULE=off go get honnef.co/go/tools/cmd/megacheck - GO111MODULE=off go build -o $@ honnef.co/go/tools/cmd/megacheck +$(BIN)/staticcheck: + GO111MODULE=off go get honnef.co/go/tools/cmd/staticcheck + GO111MODULE=off go build -o $@ honnef.co/go/tools/cmd/staticcheck $(BIN)/gocovmerge: GO111MODULE=off go get github.com/wadey/gocovmerge GO111MODULE=off go build -o $@ github.com/wadey/gocovmerge |