pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Reduce make verbosity (#13803)

Browse source 
Various make targets log huge lists of files to the terminal which are
generally useless to read. Replace those cases with short replacement
messages.

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
silverwind 2020-12-03 02:54:30 +01:00 committed by GitHub
parent 5e0a3784ea
commit 18712eab79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Makefile
View file

@ -223,15 +223,15 @@ clean:
.PHONY: fmt .PHONY: fmt
fmt: fmt:
$(GOFMT) -w $(GO_SOURCES_OWN) @echo "Running go fmt..."
@$(GOFMT) -w $(GO_SOURCES_OWN)
.PHONY: vet .PHONY: vet
vet: vet:
# Default vet @echo "Running go vet..."
$(GO) vet $(GO_PACKAGES) @$(GO) vet $(GO_PACKAGES)
# Custom vet @$(GO) build -mod=vendor code.gitea.io/gitea-vet
$(GO) build -mod=vendor code.gitea.io/gitea-vet @$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
.PHONY: $(TAGS_EVIDENCE) .PHONY: $(TAGS_EVIDENCE)
$(TAGS_EVIDENCE): $(TAGS_EVIDENCE):
@ -268,7 +268,8 @@ errcheck:
@hash errcheck > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash errcheck > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
GO111MODULE=off $(GO) get -u github.com/kisielk/errcheck; \ GO111MODULE=off $(GO) get -u github.com/kisielk/errcheck; \
fi fi
errcheck $(GO_PACKAGES) @echo "Running errcheck..."
@errcheck $(GO_PACKAGES)
.PHONY: revive .PHONY: revive
revive: revive:
@ -279,14 +280,16 @@ misspell-check:
@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \ GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \
fi fi
misspell -error -i unknwon,destory $(GO_SOURCES_OWN) @echo "Running misspell-check..."
@misspell -error -i unknwon,destory $(GO_SOURCES_OWN)
.PHONY: misspell .PHONY: misspell
misspell: misspell:
@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \ GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \
fi fi
misspell -w -i unknwon $(GO_SOURCES_OWN) @echo "Running go misspell..."
@misspell -w -i unknwon $(GO_SOURCES_OWN)
.PHONY: fmt-check .PHONY: fmt-check
fmt-check: fmt-check:
@ -336,11 +339,12 @@ watch-backend: go-check
.PHONY: test .PHONY: test
test: test:
$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(GO_PACKAGES) @echo "Running go test..."
@$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(GO_PACKAGES)
.PHONY: test-check .PHONY: test-check
test-check: test-check:
@echo "Checking if tests have changed the source tree..."; @echo "Running test-check...";
@diff=$$(git status -s); \ @diff=$$(git status -s); \
if [ -n "$$diff" ]; then \ if [ -n "$$diff" ]; then \
echo "make test has changed files in the source tree:"; \ echo "make test has changed files in the source tree:"; \
@ -352,7 +356,8 @@ test-check:
.PHONY: test\#% .PHONY: test\#%
test\#%: test\#%:
$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -run $(subst .,/,$*) $(GO_PACKAGES) @echo "Running go test..."
@$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -run $(subst .,/,$*) $(GO_PACKAGES)
.PHONY: coverage .PHONY: coverage
coverage: coverage:
@ -360,7 +365,8 @@ coverage:
.PHONY: unit-test-coverage .PHONY: unit-test-coverage
unit-test-coverage: unit-test-coverage:
$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 @echo "Running unit-test-coverage..."
@$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
.PHONY: vendor .PHONY: vendor
vendor: vendor:
@ -548,7 +554,8 @@ backend: go-check generate $(EXECUTABLE)
.PHONY: generate .PHONY: generate
generate: $(TAGS_PREREQ) generate: $(TAGS_PREREQ)
CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES) @echo "Running go generate..."
@CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@