linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Reduce verbosity of dev commands (#24917)

Browse Source 
### Before

```
$ make watch
bash build/watch.sh
make[1]: Entering directory '/Users/silverwind/git/gitea'
make[1]: Entering directory '/Users/silverwind/git/gitea'
GITEA_RUN_MODE=dev go run github.com/cosmtrek/air@v1.43.0 -c .air.toml
rm -rf public/js public/css public/fonts public/img/webpack public/serviceworker.js
NODE_ENV=development npx webpack --watch --progress
```

### After

```
$ make watch
GITEA_RUN_MODE=dev go run github.com/cosmtrek/air@v1.43.0 -c .air.toml
NODE_ENV=development npx webpack --watch --progress
```
This commit is contained in:
silverwind 2023-05-24 22:11:04 +02:00 committed by GitHub
parent 395bb33e4c
commit 1cf4d46bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.air.toml
View File

@ -2,7 +2,7 @@ root = "."
tmp_dir = ".air" tmp_dir = ".air"
[build] [build]
cmd = "make backend" cmd = "make --no-print-directory backend"
bin = "gitea" bin = "gitea"
delay = 1000 delay = 1000
include_ext = ["go", "tmpl"] include_ext = ["go", "tmpl"]

4
Makefile
View File

@ -413,11 +413,11 @@ lint-editorconfig:
.PHONY: watch .PHONY: watch
watch: watch:
bash build/watch.sh @bash build/watch.sh
.PHONY: watch-frontend .PHONY: watch-frontend
watch-frontend: node-check node_modules watch-frontend: node-check node_modules
rm -rf $(WEBPACK_DEST_ENTRIES) @rm -rf $(WEBPACK_DEST_ENTRIES)
NODE_ENV=development npx webpack --watch --progress NODE_ENV=development npx webpack --watch --progress
.PHONY: watch-backend .PHONY: watch-backend

4
build/watch.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
make watch-frontend & make --no-print-directory watch-frontend &
make watch-backend & make --no-print-directory watch-backend &
trap 'kill $(jobs -p)' EXIT trap 'kill $(jobs -p)' EXIT
wait wait