Ignore gofmt errors from vendor folder

This started failing with Go 1.20, but I haven't been able to find out why yet, despite vendor being excluded from the list of packages/files to test. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
alexellis · Aug 29, 2023 · 1d2e443 · 1d2e443
1 parent 2a30804
commit 1d2e443
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ Version := $(shell git describe --tags --dirty)
 GitCommit := $(shell git rev-parse HEAD)
 LDFLAGS := "-s -w -X github.com/alexellis/k3sup/cmd.Version=$(Version) -X github.com/alexellis/k3sup/cmd.GitCommit=$(GitCommit)"
 export GO111MODULE=on
-SOURCE_DIRS = cmd pkg main.go
+SOURCE_DIRS = main.go cmd pkg
 
 .PHONY: all
 all: gofmt test dist hash
@@ -13,8 +13,8 @@ test:
 	CGO_ENABLED=0 go test $(shell go list ./... | grep -v /vendor/|xargs echo) -cover
 
 .PHONY: gofmt
-gofmt: 
-	@test -z $(shell gofmt -l -s $(SOURCE_DIRS) ./ | tee /dev/stderr) || (echo "[WARN] Fix formatting issues with 'make fmt'" && exit 1)
+gofmt:
+	@test -z $(shell gofmt -l $(SOURCE_DIRS) ./ | grep -v vendor/| tee /dev/stderr) || (echo "[WARN] Fix formatting issues with 'make gofmt'" && exit 1)
 
 .PHONY: dist
 dist:

diff --git a/vendor/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go