From a018694f405dc69bb2dc414ff397c48bcecdaf3a Mon Sep 17 00:00:00 2001 From: Flavio Crisciani Date: Tue, 23 May 2017 22:31:58 -0700 Subject: [PATCH] Added more code checks Added missspelling Added fmt, vet, lint, ineffassign Signed-off-by: Flavio Crisciani --- libnetwork/Makefile | 49 +++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/libnetwork/Makefile b/libnetwork/Makefile index 2a94e1d78b..df3a619b1b 100644 --- a/libnetwork/Makefile +++ b/libnetwork/Makefile @@ -1,4 +1,4 @@ -.PHONY: all all-local build build-local clean cross cross-local check check-code check-format run-tests integration-tests check-local coveralls circle-ci-cross circle-ci-build circle-ci-check circle-ci +.PHONY: all all-local build build-local clean cross cross-local vet lint misspell check check-code check-format run-tests integration-tests check-local coveralls circle-ci-cross circle-ci-build circle-ci-check circle-ci SHELL=/bin/bash build_image=libnetworkbuild dockerargs = --privileged -v $(shell pwd):/go/src/github.com/docker/libnetwork -w /go/src/github.com/docker/libnetwork @@ -7,6 +7,7 @@ docker = docker run --rm -it ${dockerargs} $$EXTRA_ARGS ${container_env} ${build ciargs = -e CIRCLECI -e "COVERALLS_TOKEN=$$COVERALLS_TOKEN" -e "INSIDECONTAINER=-incontainer=true" cidocker = docker run ${dockerargs} ${ciargs} $$EXTRA_ARGS ${container_env} ${build_image} CROSS_PLATFORMS = linux/amd64 linux/386 linux/arm windows/amd64 +PACKAGES=$(shell go list ./... | grep -v /vendor/) export PATH := $(CURDIR)/bin:$(PATH) hostOS = ${shell go env GOHOSTOS} ifeq (${hostOS}, solaris) @@ -22,25 +23,31 @@ all: ${build_image}.created build check integration-tests clean all-local: build-local check-local integration-tests-local clean ${build_image}.created: + @echo "🐳 $@" docker build -f Dockerfile.build -t ${build_image} . touch ${build_image}.created build: ${build_image}.created - @echo "Building code... " + @echo "🐳 $@" @${docker} ./wrapmake.sh build-local - @echo "Done building code" build-local: + @echo "🐳 $@" @mkdir -p "bin" go build -tags experimental -o "bin/dnet" ./cmd/dnet go build -o "bin/docker-proxy" ./cmd/proxy clean: + @echo "🐳 $@" @if [ -d bin ]; then \ echo "Removing dnet and proxy binaries"; \ rm -rf bin; \ fi +force-clean: clean + @echo "🐳 $@" + @rm -rf ${build_image}.created + cross: ${build_image}.created @mkdir -p "bin" @for platform in ${CROSS_PLATFORMS}; do \ @@ -50,25 +57,19 @@ cross: ${build_image}.created done cross-local: + @echo "🐳 $@" go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy check: ${build_image}.created @${docker} ./wrapmake.sh check-local -check-code: - @echo "Checking code... " - test -z "$$(golint ./... | grep -Ev 'vendor|.pb.go:' | tee /dev/stderr)" - test -z "$$(go vet ./... 2>&1 > /dev/null | grep -Ev 'vendor|exit' | tee /dev/stderr)" - @echo "Done checking code" +check-code: lint vet ineffassign -check-format: - @echo "Checking format... " - test -z "$$(gofmt -s -l . | grep -v vendor/ | tee /dev/stderr)" - @echo "Done checking format" +check-format: fmt misspell run-tests: - @echo "Running tests... " + @echo "🐳 Running tests... " @echo "mode: count" > coverage.coverprofile @for dir in $$( ${gnufind} . -maxdepth 10 -not -path './.git*' -not -path '*/_*' -not -path './vendor/*' -type d); do \ if [ ${hostOS} == solaris ]; then \ @@ -130,6 +131,28 @@ integration-tests: ./bin/dnet coveralls: -@goveralls -service circleci -coverprofile=coverage.coverprofile -repotoken $$COVERALLS_TOKEN +# Depends on binaries because vet will silently fail if it can not load compiled imports +vet: ## run go vet + @echo "🐳 $@" + @test -z "$$(go vet ${PACKAGES} 2>&1 | grep -v 'constant [0-9]* not a string in call to Errorf' | egrep -v '(timestamp_test.go|duration_test.go|exit status 1)' | tee /dev/stderr)" + +misspell: + @echo "🐳 $@" + @test -z "$$(find . -type f | grep -v vendor/ | grep -v bin/ | grep -v .git/ | grep -v MAINTAINERS | xargs misspell | tee /dev/stderr)" + +fmt: ## run go fmt + @echo "🐳 $@" + @test -z "$$(gofmt -s -l . | grep -v vendor/ | grep -v ".pb.go$$" | tee /dev/stderr)" || \ + (echo "👹 please format Go code with 'gofmt -s -w'" && false) + +lint: ## run go lint + @echo "🐳 $@" + @test -z "$$(golint ./... | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)" + +ineffassign: ## run ineffassign + @echo "🐳 $@" + @test -z "$$(ineffassign . | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)" + # CircleCI's Docker fails when cleaning up using the --rm flag # The following targets are a workaround for this circle-ci-cross: ${build_image}.created