RepoMirrors
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run staticcheck from Makefile, remove duplicate end-to-end test call in CI

This commit is contained in:
Matt Layher 2017-02-02 12:50:28 -05:00
parent 5d22d41ed7
commit 748f835171
No known key found for this signature in database
GPG Key ID: 77BFE531397EDE94
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -7,4 +7,3 @@ go:
script: script:
- make - make
- ./end-to-end-test.sh

17
Makefile
View File

@ -13,7 +13,9 @@
GO ?= GO15VENDOREXPERIMENT=1 go GO ?= GO15VENDOREXPERIMENT=1 go
GOPATH := $(firstword $(subst :, ,$(GOPATH))) GOPATH := $(firstword $(subst :, ,$(GOPATH)))
PROMU ?= $(GOPATH)/bin/promu PROMU ?= $(GOPATH)/bin/promu
STATICCHECK ?= $(GOPATH)/bin/staticcheck
pkgs = $(shell $(GO) list ./... | grep -v /vendor/) pkgs = $(shell $(GO) list ./... | grep -v /vendor/)
PREFIX ?= $(shell pwd) PREFIX ?= $(shell pwd)
@ -33,7 +35,7 @@ else
test-e2e := skip-test-e2e test-e2e := skip-test-e2e
endif endif
all: format build test $(test-e2e) all: format vet staticcheck build test $(test-e2e)
style: style:
@echo ">> checking code style" @echo ">> checking code style"
@ -58,6 +60,10 @@ vet:
@echo ">> vetting code" @echo ">> vetting code"
@$(GO) vet $(pkgs) @$(GO) vet $(pkgs)
staticcheck: $(STATICCHECK)
@echo ">> running staticcheck"
@$(STATICCHECK) $(pkgs)
build: $(PROMU) build: $(PROMU)
@echo ">> building binaries" @echo ">> building binaries"
@$(PROMU) build --prefix $(PREFIX) @$(PROMU) build --prefix $(PREFIX)
@ -71,9 +77,10 @@ docker:
@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . @docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .
$(GOPATH)/bin/promu promu: $(GOPATH)/bin/promu promu:
@GOOS=$(shell uname -s | tr A-Z a-z) \ @GOOS= GOARCH= $(GO) get -u github.com/prometheus/promu
GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
$(GO) get -u github.com/prometheus/promu $(GOPATH)/bin/staticcheck:
@GOOS= GOARCH= $(GO) get -u honnef.co/go/tools/cmd/staticcheck
.PHONY: all style format build test test-e2e vet tarball docker promu $(GOPATH)/bin/promu .PHONY: all style format build test test-e2e vet tarball docker promu staticcheck $(GOPATH)/bin/promu $(GOPATH)/bin/staticcheck