From 0faf81320d38fa84e0126e3ceaae857c1c3ff0c9 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Sat, 25 Jul 2020 16:41:59 -0400 Subject: [PATCH] rollup static analysis to make target --- .circleci/config.yml | 2 +- Makefile | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 774929d8..7a5a0226 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 5619d577..dc4096ef 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,8 @@ define title @printf '$(TITLE)$(1)$(RESET)\n' endef -.PHONY: all bootstrap lint lint-fix unit coverage integration check-pipeline clear-cache help test - -all: clean lint check-licenses test ## Run all checks (linting, license check, unit, integration, and linux acceptance tests tests) +.PHONY: all +all: clean static-analysis test ## Run all checks (linting, license check, unit, integration, and linux acceptance tests tests) @printf '$(SUCCESS)All checks pass!$(RESET)\n' .PHONY: compare @@ -78,6 +77,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)