From 641854e67c9b3d909b7afed7ff05fd85263df878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=20K=C3=B6ser?= Date: Thu, 27 May 2021 12:33:38 +0200 Subject: [PATCH] build(make): simplify Makefile Replace complex formatting loop with simple gofumpt call. Remove two instructions from 'setup' function. --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4a878f6..85c843f 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,6 @@ export GOPROXY = https://proxy.golang.org,direct # Install all the build and lint dependencies setup: - go mod download - go generate -v ./... go mod tidy .PHONY: setup @@ -25,9 +23,9 @@ test: # CODE HEALTH ############################################################################### -# gofumports and gci all go files +# gofumpt and gci all go files fmt: - find . -name '*.go' -not -wholename './vendor/*' | while read -r file; do gofumpt -w "$$file"; done + gofumpt -w . gci -w -local github.com/nikoksr/notify . .PHONY: fmt @@ -36,7 +34,7 @@ lint: golangci-lint run ./... .PHONY: lint -ci: test lint +ci: lint test .PHONY: ci .DEFAULT_GOAL := ci