Merge pull request #2118 from halseth/make-fmt-2
make: ensure make fmt is run with -s flag
This commit is contained in:
commit
5c41243f35
3
Makefile
3
Makefile
@ -25,6 +25,7 @@ GOBUILD := GO111MODULE=on go build -v
|
|||||||
GOINSTALL := GO111MODULE=on go install -v
|
GOINSTALL := GO111MODULE=on go install -v
|
||||||
GOTEST := GO111MODULE=on go test -v
|
GOTEST := GO111MODULE=on go test -v
|
||||||
|
|
||||||
|
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
|
||||||
GOLIST := go list $(PKG)/... | grep -v '/vendor/'
|
GOLIST := go list $(PKG)/... | grep -v '/vendor/'
|
||||||
GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./')
|
GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./')
|
||||||
GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc')
|
GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc')
|
||||||
@ -165,7 +166,7 @@ flake-unit:
|
|||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
@$(call print, "Formatting source.")
|
@$(call print, "Formatting source.")
|
||||||
$(GOLIST) | $(XARGS) go fmt -x
|
gofmt -l -w -s $(GOFILES_NOVENDOR)
|
||||||
|
|
||||||
lint: $(LINT_BIN)
|
lint: $(LINT_BIN)
|
||||||
@$(call print, "Linting source.")
|
@$(call print, "Linting source.")
|
||||||
|
Loading…
Reference in New Issue
Block a user