core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Antoine GIRARD 2020-02-08 01:14:43 +01:00 committed by GitHub
parent 4721d45c2a
commit 632df9b996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -121,6 +121,7 @@ help:
@echo " - vet examines Go source code and reports suspicious constructs" @echo " - vet examines Go source code and reports suspicious constructs"
@echo " - test run unit test" @echo " - test run unit test"
@echo " - test-sqlite run integration test for sqlite" @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 .PHONY: go-check
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);) $(foreach file, $(shell find public/img -type f -name '*.png' ! -name 'loading.png'),zopflipng -m -y $(file) $(file);)
.PHONY: pr\#% .PHONY: pr\#%
pr\#%: pr\#%: clean-all
$(GO) run contrib/pr/checkout.go $* $(GO) run contrib/pr/checkout.go $*
.PHONY: golangci-lint .PHONY: golangci-lint

3
contrib/pr/checkout.go
View File

@ -247,7 +247,8 @@ func main() {
log.Fatalf("Failed to duplicate this code file in PR : %v", err) 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 //Start with integration test
runCmd("go", "run", "-tags", "sqlite sqlite_unlock_notify", codeFilePath, "-run") runCmd("go", "run", "-tags", "sqlite sqlite_unlock_notify", codeFilePath, "-run")
} }