From 9f5908f1968c3a134af86a49755bb7db23dd585d Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Wed, 10 Nov 2021 20:24:35 +0100 Subject: [PATCH] chore: Bump gofumpt to v0.2.0 --- .gitignore | 4 +--- Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6a14a5e3bca..8331ce175e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ -*.exe /.vagrant -/bin/chezmoi -/bin/gofumports +/bin/gofumpt /bin/golangci-lint /chezmoi /chezmoi.exe diff --git a/Makefile b/Makefile index a1d4a687412..b074407bf27 100644 --- a/Makefile +++ b/Makefile @@ -74,17 +74,17 @@ lint: ensure-golangci-lint ${GO} run ./internal/cmds/lint-whitespace .PHONY: format -format: ensure-gofumports - find . -name \*.go | xargs ./bin/gofumports -local github.com/twpayne/chezmoi -w +format: ensure-gofumpt + find . -name \*.go | xargs ./bin/gofumpt -w .PHONY: ensure-tools ensure-tools: ensure-gofumports ensure-golangci-lint -.PHONY: ensure-gofumports +.PHONY: ensure-gofumpt ensure-gofumports: - if [ ! -x bin/gofumports ] ; then \ + if [ ! -x bin/gofumpt ] ; then \ mkdir -p bin ; \ - GOBIN=$(shell pwd)/bin ${GO} install mvdan.cc/gofumpt/gofumports@latest ; \ + GOBIN=$(shell pwd)/bin ${GO} install mvdan.cc/gofumpt@v0.2.0 ; \ fi .PHONY: ensure-golangci-lint