diff --git a/.circleci/config.yml b/.circleci/config.yml index 8dc9a5874..7b766e418 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: - run: name: run static analysis - command: make lint + command: make static-analysis run-tests: parameters: diff --git a/Makefile b/Makefile index 59b767f3c..25d33e4b0 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ endef ## Tasks .PHONY: all -all: clean lint check-licenses test ## Run all linux-based checks (linting, license check, unit, integration, and linux acceptance tests) +all: clean static-analysis test ## Run all linux-based checks (linting, license check, unit, integration, and linux acceptance tests) @printf '$(SUCCESS)All checks pass!$(RESET)\n' .PHONY: compare @@ -63,7 +63,7 @@ compare: @cd test/inline-compare && make .PHONY: test -test: unit integration acceptance-linux ## Run all tests (currently unit, integration, and linux acceptance tests ) +test: unit integration acceptance-linux ## Run all tests (currently unit, integration, and linux acceptance tests) .PHONY: help help: @@ -87,6 +87,9 @@ bootstrap: ## Download and install all go dependencies (+ prep tooling in the ./ [ -f "$(TEMPDIR)/bouncer" ] || curl -sSfL https://raw.githubusercontent.com/wagoodman/go-bouncer/master/bouncer.sh | sh -s -- -b $(TEMPDIR)/ v0.1.0 [ -f "$(TEMPDIR)/goreleaser" ] || curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh -s -- -b $(TEMPDIR)/ v0.140.0 +.PHONY: static-analysis +static-analysis: lint check-licenses + .PHONY: lint lint: ## Run gofmt + golangci lint checks $(call title,Running linters)