diff options
| author | PrometheusBot <prometheus-team@googlegroups.com> | 2019-05-07 05:38:46 +0100 |
|---|---|---|
| committer | Ben Kochie <superq@gmail.com> | 2019-05-07 06:38:46 +0200 |
| commit | 0c6b90be4e018d92e15925994403f351b668f76d (patch) | |
| tree | 127767a243e67a43392725ab97e9df0a4a51006c /Makefile.common | |
| parent | 86f907942939fac63fb4bf6c8cabae8ca4f3b975 (diff) | |
| download | prometheus_node_collector-0c6b90be4e018d92e15925994403f351b668f76d.tar.bz2 prometheus_node_collector-0c6b90be4e018d92e15925994403f351b668f76d.tar.xz prometheus_node_collector-0c6b90be4e018d92e15925994403f351b668f76d.zip | |
makefile: update Makefile.common with newer version (#1332)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index 73052b3..4f18ea5 100644 --- a/Makefile.common +++ b/Makefile.common | |||
| @@ -73,6 +73,7 @@ PROMU_VERSION ?= 0.3.0 | |||
| 73 | PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz | 73 | PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz |
| 74 | 74 | ||
| 75 | GOLANGCI_LINT := | 75 | GOLANGCI_LINT := |
| 76 | GOLANGCI_LINT_OPTS ?= | ||
| 76 | GOLANGCI_LINT_VERSION ?= v1.16.0 | 77 | GOLANGCI_LINT_VERSION ?= v1.16.0 |
| 77 | # golangci-lint only supports linux, darwin and windows platforms on i386/amd64. | 78 | # golangci-lint only supports linux, darwin and windows platforms on i386/amd64. |
| 78 | # windows isn't included here because of the path separator being different. | 79 | # windows isn't included here because of the path separator being different. |
| @@ -166,7 +167,7 @@ ifdef GO111MODULE | |||
| 166 | # 'go list' needs to be executed before staticcheck to prepopulate the modules cache. | 167 | # 'go list' needs to be executed before staticcheck to prepopulate the modules cache. |
| 167 | # Otherwise staticcheck might fail randomly for some reason not yet explained. | 168 | # Otherwise staticcheck might fail randomly for some reason not yet explained. |
| 168 | GO111MODULE=$(GO111MODULE) $(GO) list -e -compiled -test=true -export=false -deps=true -find=false -tags= -- ./... > /dev/null | 169 | GO111MODULE=$(GO111MODULE) $(GO) list -e -compiled -test=true -export=false -deps=true -find=false -tags= -- ./... > /dev/null |
| 169 | GO111MODULE=$(GO111MODULE) $(GOLANGCI_LINT) run $(pkgs) | 170 | GO111MODULE=$(GO111MODULE) $(GOLANGCI_LINT) run $(GOLANGCI_LINT_OPTS) $(pkgs) |
| 170 | else | 171 | else |
| 171 | $(GOLANGCI_LINT) run $(pkgs) | 172 | $(GOLANGCI_LINT) run $(pkgs) |
| 172 | endif | 173 | endif |