Revert "make: ensure make fmt is run with -s flag"
This reverts commit e8003af3cd7b7a08f8e34233e2071a70245b3c69.
This commit is contained in:
parent
071cbcc1ef
commit
de186b4a06
5
Makefile
5
Makefile
@ -36,13 +36,14 @@ GOBUILD := go build -v
|
|||||||
GOINSTALL := go install -v
|
GOINSTALL := go install -v
|
||||||
GOTEST := go test -v
|
GOTEST := go test -v
|
||||||
|
|
||||||
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./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')
|
||||||
|
|
||||||
RM := rm -f
|
RM := rm -f
|
||||||
CP := cp
|
CP := cp
|
||||||
MAKE := make
|
MAKE := make
|
||||||
|
XARGS := xargs -L 1
|
||||||
|
|
||||||
include make/testing_flags.mk
|
include make/testing_flags.mk
|
||||||
|
|
||||||
@ -210,7 +211,7 @@ endif
|
|||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
@$(call print, "Formatting source.")
|
@$(call print, "Formatting source.")
|
||||||
gofmt -l -w -s $(GOFILES_NOVENDOR)
|
$(GOLIST) | $(XARGS) go fmt -x
|
||||||
|
|
||||||
lint: $(LINT_BIN)
|
lint: $(LINT_BIN)
|
||||||
@$(call print, "Linting source.")
|
@$(call print, "Linting source.")
|
||||||
|
Loading…
Reference in New Issue
Block a user