From 632df9b996522792ddcaf102c1e9921447484dc4 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Sat, 8 Feb 2020 01:14:43 +0100 Subject: [PATCH] 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> --- Makefile | 3 ++- contrib/pr/checkout.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4177d7856..9f2e5b382 100644 --- a/Makefile +++ b/Makefile @@ -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# 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 34cd82ff0..1f387f824 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") }