From c63635fa5d958a705f5d9cce357f9a88a2a85175 Mon Sep 17 00:00:00 2001 From: Jay Camp Date: Thu, 7 May 2020 19:06:41 -0400 Subject: [PATCH] Fix running lint in individual modules (#216) LINT defaults to [lint in make](https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html) so it was still running the old go program called `lint`. However this program isn't included in install-modules anymore. Set LINT in common so all includers get it. --- Makefile | 1 - Makefile.Common | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e7974a9471013..57c246a7ca4bb 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION) endif BUILD_X3=-X github.com/open-telemetry/opentelemetry-collector/internal/version.BuildType=$(BUILD_TYPE) BUILD_INFO=-ldflags "${BUILD_X1} ${BUILD_X2} ${BUILD_X3}" -LINT=golangci-lint STATIC_CHECK=staticcheck .DEFAULT_GOAL := all diff --git a/Makefile.Common b/Makefile.Common index dee06183f73e4..01a1c39575c40 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -19,6 +19,7 @@ ADDLICENCESE= addlicense MISSPELL=misspell -error MISSPELL_CORRECTION=misspell -w STATICCHECK=staticcheck +LINT=golangci-lint IMPI=impi # BUILD_TYPE should be one of (dev, release). BUILD_TYPE?=release