Skip to content

Commit

Permalink
Fix make help description and logging info
Browse files Browse the repository at this point in the history
  • Loading branch information
mrymsza authored and martinkennelly committed Dec 18, 2020
1 parent fb9fa79 commit 10258c3
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Q = $(if $(filter 1,$V),,@)
.PHONY: all
all: fmt lint build

$(BASE): ; $(info setting GOPATH...)
$(BASE): ; $(info Setting GOPATH...)
@mkdir -p $(dir $@)
@ln -sf $(CURDIR) $@

Expand All @@ -58,7 +58,7 @@ $(GOBIN):
$(BUILDDIR): | $(BASE) ; $(info Creating build directory...)
@cd $(BASE) && mkdir -p $@

build: $(BUILDDIR)/$(BINARY_NAME) | ; $(info Building $(BINARY_NAME)...)
build: $(BUILDDIR)/$(BINARY_NAME) | ; $(info Building $(BINARY_NAME)...) @ ## Build SR-IOV CNI plugin
$(info Done!)

$(BUILDDIR)/$(BINARY_NAME): $(GOFILES) | $(BUILDDIR)
Expand All @@ -68,23 +68,23 @@ $(BUILDDIR)/$(BINARY_NAME): $(GOFILES) | $(BUILDDIR)
# Tools

GOLINT = $(GOBIN)/golint
$(GOBIN)/golint: | $(BASE) ; $(info building golint...)
$(GOBIN)/golint: | $(BASE) ; $(info Building golint...)
$Q go get -u golang.org/x/lint/golint

GOCOVMERGE = $(GOBIN)/gocovmerge
$(GOBIN)/gocovmerge: | $(BASE) ; $(info building gocovmerge...)
$(GOBIN)/gocovmerge: | $(BASE) ; $(info Building gocovmerge...)
$Q go get github.com/wadey/gocovmerge

GOCOV = $(GOBIN)/gocov
$(GOBIN)/gocov: | $(BASE) ; $(info building gocov...)
$(GOBIN)/gocov: | $(BASE) ; $(info Building gocov...)
$Q go get github.com/axw/gocov/...

GOCOVXML = $(GOBIN)/gocov-xml
$(GOBIN)/gocov-xml: | $(BASE) ; $(info building gocov-xml...)
$(GOBIN)/gocov-xml: | $(BASE) ; $(info Building gocov-xml...)
$Q go get github.com/AlekSi/gocov-xml

GO2XUNIT = $(GOBIN)/go2xunit
$(GOBIN)/go2xunit: | $(BASE) ; $(info building go2xunit...)
$(GOBIN)/go2xunit: | $(BASE) ; $(info Building go2xunit...)
$Q go get github.com/tebeka/go2xunit


Expand All @@ -98,10 +98,10 @@ test-verbose: ARGS=-v ## Run tests in verbose mode with coverage repo
test-race: ARGS=-race ## Run tests with race detector
$(TEST_TARGETS): NAME=$(MAKECMDGOALS:test-%=%)
$(TEST_TARGETS): test
check test tests: fmt lint | $(BASE) ; $(info running $(NAME:%=% )tests...) @ ## Run tests
check test tests: fmt lint | $(BASE) ; $(info Running $(NAME:%=% )tests...) @ ## Run tests
$Q cd $(BASE) && $(GO) test -timeout $(TIMEOUT)s $(ARGS) $(TESTPKGS)

test-xml: fmt lint | $(BASE) $(GO2XUNIT) ; $(info running $(NAME:%=% )tests...) @ ## Run tests with xUnit output
test-xml: fmt lint | $(BASE) $(GO2XUNIT) ; $(info Running $(NAME:%=% )tests...) @ ## Run tests with xUnit output
$Q cd $(BASE) && 2>&1 $(GO) test -timeout 20s -v $(TESTPKGS) | tee test/tests.output
$(GO2XUNIT) -fail -input test/tests.output -output test/tests.xml

Expand All @@ -112,7 +112,7 @@ COVERAGE_HTML = $(COVERAGE_DIR)/index.html
.PHONY: test-coverage test-coverage-tools
test-coverage-tools: | $(GOCOVMERGE) $(GOCOV) $(GOCOVXML)
test-coverage: COVERAGE_DIR := $(CURDIR)/test/coverage.$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
test-coverage: fmt lint test-coverage-tools | $(BASE) ; $(info running coverage tests...) @ ## Run coverage tests
test-coverage: fmt lint test-coverage-tools | $(BASE) ; $(info Running coverage tests...) @ ## Run coverage tests
$Q mkdir -p $(COVERAGE_DIR)/coverage
$Q cd $(BASE) && for pkg in $(TESTPKGS); do \
$(GO) test \
Expand All @@ -127,38 +127,38 @@ test-coverage: fmt lint test-coverage-tools | $(BASE) ; $(info running coverage
$Q $(GOCOV) convert $(COVERAGE_PROFILE) | $(GOCOVXML) > $(COVERAGE_XML)

.PHONY: lint
lint: | $(BASE) $(GOLINT) ; $(info running golint...) @ ## Run golint
lint: | $(BASE) $(GOLINT) ; $(info Running golint...) @ ## Run golint on all source files
$Q cd $(BASE) && ret=0 && for pkg in $(PKGS); do \
test -z "$$($(GOLINT) $$pkg | tee /dev/stderr)" || ret=1 ; \
done ; exit $$ret

.PHONY: fmt
fmt: ; $(info running gofmt...) @ ## Run gofmt on all source files
fmt: ; $(info Running gofmt...) @ ## Run gofmt on all source files
@ret=0 && for d in $$($(GO) list -f '{{.Dir}}' ./... | grep -v /vendor/); do \
$(GOFMT) -l -w $$d/*.go || ret=$$? ; \
done ; exit $$ret

# Dependency management
.PHONY: deps-update
deps-update: ; $(info updating dependencies...)
go mod tidy && go mod vendor
deps-update: ; $(info Updating dependencies...) @ ## Update dependencies
@go mod tidy && go mod vendor

# Docker image
# To pass proxy for Docker invoke it as 'make image HTTP_POXY=http://192.168.0.1:8080'
.PHONY: image
image: | $(BASE) ; $(info Building Docker image...)
image: | $(BASE) ; $(info Building Docker image...) @ ## Build SR-IOV CNI docker image
@docker build -t $(TAG) -f $(DOCKERFILE) $(CURDIR) $(DOCKERARGS)

# Misc

.PHONY: clean
clean: ; $(info Cleaning...) @ ## Cleanup everything
clean: ; $(info Cleaning...) @ ## Cleanup everything
@go clean --modcache
@rm -rf $(GOPATH)
@rm -rf $(BUILDDIR)/$(BINARY_NAME)
@rm -rf test/tests.* test/coverage.*

.PHONY: help
help:
help: ; @ ## Display this help message
@grep -E '^[ a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}'

0 comments on commit 10258c3

Please sign in to comment.