Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce verbosity of dev commands #24917

Merged
merged 5 commits into from
May 24, 2023
Merged

Reduce verbosity of dev commands #24917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36a582a
Always run `make` with `--no-print-directory`
silverwind May 24, 2023
883e5fa
-s implies --no-print-directory
silverwind May 24, 2023
64f7d5c
silent watch command
silverwind May 24, 2023
3f68a6a
silent delete
silverwind May 24, 2023
6e91d6c
Merge branch 'main' into makenoprint
jolheiser May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .air.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,11 @@ lint-editorconfig:

.PHONY: watch
watch:
bash build/watch.sh
@bash build/watch.sh

.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
Expand Down
4 changes: 2 additions & 2 deletions build/watch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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