diff options
| author | Antoine GIRARD <sapk@users.noreply.github.com> | 2020-02-08 01:14:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-08 01:14:43 +0100 |
| commit | 632df9b996522792ddcaf102c1e9921447484dc4 (patch) | |
| tree | 65a75f2f18d5771a01df73c6ef34b7a04ca47def | |
| parent | 4721d45c2aa9ea7f0587188938ea78bec584c5b6 (diff) | |
| download | gitea-632df9b996522792ddcaf102c1e9921447484dc4.tar.gz gitea-632df9b996522792ddcaf102c1e9921447484dc4.zip | |
Improve make PR (force build and help message) (#10178)
* Force build of assets
* Add make pr to make help
* apply @jolheiser suggestion
Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com>
* Run clean-all before make pr
Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | contrib/pr/checkout.go | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -121,6 +121,7 @@ help: @echo " - vet examines Go source code and reports suspicious constructs" @echo " - test run unit test" @echo " - test-sqlite run integration test for sqlite" + @echo " - pr#<index> build and start gitea from a PR with integration test data loaded" .PHONY: go-check go-check: @@ -565,7 +566,7 @@ generate-images: $(foreach file, $(shell find public/img -type f -name '*.png' ! -name 'loading.png'),zopflipng -m -y $(file) $(file);) .PHONY: pr\#% -pr\#%: +pr\#%: clean-all $(GO) run contrib/pr/checkout.go $* .PHONY: golangci-lint diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go index 34cd82ff0a..1f387f824e 100644 --- a/contrib/pr/checkout.go +++ b/contrib/pr/checkout.go @@ -247,7 +247,8 @@ func main() { log.Fatalf("Failed to duplicate this code file in PR : %v", err) } } - time.Sleep(5 * time.Second) + //Force build of js, css, bin, ... + runCmd("make", "build") //Start with integration test runCmd("go", "run", "-tags", "sqlite sqlite_unlock_notify", codeFilePath, "-run") } |