From 36a582a40860f6bc21f0f226e798387358b9702a Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 24 May 2023 19:06:46 +0200 Subject: [PATCH 1/4] Always run `make` with `--no-print-directory` --- .air.toml | 2 +- Makefile | 2 +- build/watch.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.air.toml b/.air.toml index 6825118b95ed6..d13f8c4f99577 100644 --- a/.air.toml +++ b/.air.toml @@ -2,7 +2,7 @@ root = "." tmp_dir = ".air" [build] -cmd = "make backend" +cmd = "make --no-print-directory backend" bin = "gitea" delay = 1000 include_ext = ["go", "tmpl"] diff --git a/Makefile b/Makefile index fde7e990c5a32..21a46d6cab8fc 100644 --- a/Makefile +++ b/Makefile @@ -936,7 +936,7 @@ fomantic: webpack: $(WEBPACK_DEST) $(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json - @$(MAKE) -s node-check node_modules + @$(MAKE) --no-print-directory -s node-check node_modules rm -rf $(WEBPACK_DEST_ENTRIES) npx webpack @touch $(WEBPACK_DEST) diff --git a/build/watch.sh b/build/watch.sh index 61e3dc40a25bc..5e8defa49c89e 100644 --- a/build/watch.sh +++ b/build/watch.sh @@ -1,8 +1,8 @@ #!/bin/bash set -euo pipefail -make watch-frontend & -make watch-backend & +make --no-print-directory watch-frontend & +make --no-print-directory watch-backend & trap 'kill $(jobs -p)' EXIT wait From 883e5fa223c9034d241a4ed64c01f95d4506788f Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 24 May 2023 20:12:18 +0200 Subject: [PATCH 2/4] -s implies --no-print-directory --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21a46d6cab8fc..fde7e990c5a32 100644 --- a/Makefile +++ b/Makefile @@ -936,7 +936,7 @@ fomantic: webpack: $(WEBPACK_DEST) $(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json - @$(MAKE) --no-print-directory -s node-check node_modules + @$(MAKE) -s node-check node_modules rm -rf $(WEBPACK_DEST_ENTRIES) npx webpack @touch $(WEBPACK_DEST) From 64f7d5c4179d191166d6dc87d1a4c203a4098d25 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 24 May 2023 20:15:10 +0200 Subject: [PATCH 3/4] silent watch command --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fde7e990c5a32..98c30523db0a7 100644 --- a/Makefile +++ b/Makefile @@ -413,7 +413,7 @@ lint-editorconfig: .PHONY: watch watch: - bash build/watch.sh + @bash build/watch.sh .PHONY: watch-frontend watch-frontend: node-check node_modules From 3f68a6acd6cdc5fe7a5dba810c7e8fc4495fe8f5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 24 May 2023 20:16:23 +0200 Subject: [PATCH 4/4] silent delete --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 98c30523db0a7..6873cac811752 100644 --- a/Makefile +++ b/Makefile @@ -417,7 +417,7 @@ watch: .PHONY: watch-frontend watch-frontend: node-check node_modules - rm -rf $(WEBPACK_DEST_ENTRIES) + @rm -rf $(WEBPACK_DEST_ENTRIES) NODE_ENV=development npx webpack --watch --progress .PHONY: watch-backend