Skip to content

Commit 18712ea

Browse files
Reduce make verbosity (#13803)
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 <[email protected]>
1 parent 5e0a378 commit 18712ea

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

Makefile

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,15 @@ clean:
223223

224224
.PHONY: fmt
225225
fmt:
226-
$(GOFMT) -w $(GO_SOURCES_OWN)
226+
@echo "Running go fmt..."
227+
@$(GOFMT) -w $(GO_SOURCES_OWN)
227228

228229
.PHONY: vet
229230
vet:
230-
# Default vet
231-
$(GO) vet $(GO_PACKAGES)
232-
# Custom vet
233-
$(GO) build -mod=vendor code.gitea.io/gitea-vet
234-
$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
231+
@echo "Running go vet..."
232+
@$(GO) vet $(GO_PACKAGES)
233+
@$(GO) build -mod=vendor code.gitea.io/gitea-vet
234+
@$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
235235

236236
.PHONY: $(TAGS_EVIDENCE)
237237
$(TAGS_EVIDENCE):
@@ -268,7 +268,8 @@ errcheck:
268268
@hash errcheck > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
269269
GO111MODULE=off $(GO) get -u github.com/kisielk/errcheck; \
270270
fi
271-
errcheck $(GO_PACKAGES)
271+
@echo "Running errcheck..."
272+
@errcheck $(GO_PACKAGES)
272273

273274
.PHONY: revive
274275
revive:
@@ -279,14 +280,16 @@ misspell-check:
279280
@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
280281
GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \
281282
fi
282-
misspell -error -i unknwon,destory $(GO_SOURCES_OWN)
283+
@echo "Running misspell-check..."
284+
@misspell -error -i unknwon,destory $(GO_SOURCES_OWN)
283285

284286
.PHONY: misspell
285287
misspell:
286288
@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
287289
GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \
288290
fi
289-
misspell -w -i unknwon $(GO_SOURCES_OWN)
291+
@echo "Running go misspell..."
292+
@misspell -w -i unknwon $(GO_SOURCES_OWN)
290293

291294
.PHONY: fmt-check
292295
fmt-check:
@@ -336,11 +339,12 @@ watch-backend: go-check
336339

337340
.PHONY: test
338341
test:
339-
$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(GO_PACKAGES)
342+
@echo "Running go test..."
343+
@$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(GO_PACKAGES)
340344

341345
.PHONY: test-check
342346
test-check:
343-
@echo "Checking if tests have changed the source tree...";
347+
@echo "Running test-check...";
344348
@diff=$$(git status -s); \
345349
if [ -n "$$diff" ]; then \
346350
echo "make test has changed files in the source tree:"; \
@@ -352,15 +356,17 @@ test-check:
352356

353357
.PHONY: test\#%
354358
test\#%:
355-
$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -run $(subst .,/,$*) $(GO_PACKAGES)
359+
@echo "Running go test..."
360+
@$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -run $(subst .,/,$*) $(GO_PACKAGES)
356361

357362
.PHONY: coverage
358363
coverage:
359364
GO111MODULE=on $(GO) run -mod=vendor build/gocovmerge.go integration.coverage.out $(shell find . -type f -name "coverage.out") > coverage.all
360365

361366
.PHONY: unit-test-coverage
362367
unit-test-coverage:
363-
$(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
368+
@echo "Running unit-test-coverage..."
369+
@$(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
364370

365371
.PHONY: vendor
366372
vendor:
@@ -548,7 +554,8 @@ backend: go-check generate $(EXECUTABLE)
548554

549555
.PHONY: generate
550556
generate: $(TAGS_PREREQ)
551-
CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
557+
@echo "Running go generate..."
558+
@CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
552559

553560
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
554561
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

0 commit comments

Comments
 (0)