diff --git a/Makefile b/Makefile index c3b5384391d..ffb9b8e7b83 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ include ./Makefile.Common -# This is the code that we want to run checklicense, staticcheck, etc. +# This is the code that we want to run lint, etc. ALL_SRC := $(shell find . -name '*.go' \ -not -path './cmd/issuegenerator/*' \ -not -path './cmd/mdatagen/*' \ @@ -147,7 +147,6 @@ install-tools: cd $(TOOLS_MOD_DIR) && go install github.com/pavius/impi/cmd/impi cd $(TOOLS_MOD_DIR) && go install github.com/tcnksm/ghr cd $(TOOLS_MOD_DIR) && go install golang.org/x/tools/cmd/goimports - cd $(TOOLS_MOD_DIR) && go install honnef.co/go/tools/cmd/staticcheck cd cmd/mdatagen && go install ./ .PHONY: otelcol diff --git a/Makefile.Common b/Makefile.Common index ae66699e9a4..ff4242213c2 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -18,7 +18,6 @@ GOTEST=go test ADDLICENCESE=addlicense MISSPELL=misspell -error MISSPELL_CORRECTION=misspell -w -STATIC_CHECK=staticcheck LINT=golangci-lint IMPI=impi @@ -61,19 +60,8 @@ fmt: gofmt -w -s ./ goimports -w -local go.opentelemetry.io/collector ./ -.PHONY: lint-static-check -lint-static-check: - @STATIC_CHECK_OUT=`$(STATIC_CHECK) $(ALL_PKGS) 2>&1`; \ - if [ "$$STATIC_CHECK_OUT" ]; then \ - echo "$(STATIC_CHECK) FAILED => static check errors:\n"; \ - echo "$$STATIC_CHECK_OUT\n"; \ - exit 1; \ - else \ - echo "Static check finished successfully"; \ - fi - .PHONY: lint -lint: lint-static-check +lint: $(LINT) run --allow-parallel-runners .PHONY: misspell diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 9ebbc6716a7..8a389818cad 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -12,5 +12,4 @@ require ( github.com/pavius/impi v0.0.3 github.com/tcnksm/ghr v0.13.0 golang.org/x/tools v0.1.0 - honnef.co/go/tools v0.0.1-2020.1.6 ) diff --git a/internal/tools/tools.go b/internal/tools/tools.go index 3ef25767714..23ef3cc4d9f 100644 --- a/internal/tools/tools.go +++ b/internal/tools/tools.go @@ -31,5 +31,4 @@ import ( _ "github.com/pavius/impi/cmd/impi" _ "github.com/tcnksm/ghr" _ "golang.org/x/tools/cmd/goimports" - _ "honnef.co/go/tools/cmd/staticcheck" )