IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:38:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into resource-store-bridge

Browse Source
This commit is contained in:
Ryan McKinley 2024-07-03 14:45:35 -07:00
commit 59a142095f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.bra.toml
View File

@ -2,7 +2,7 @@
init_cmds = [ init_cmds = [
["GO_BUILD_DEV=1", "make", "build-go"], ["GO_BUILD_DEV=1", "make", "build-go"],
["make", "gen-jsonnet"], ["make", "gen-jsonnet"],
["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"] ["./bin/grafana", "server", "-profile", "-profile-addr=127.0.0.1", "-profile-port=6000", "-packaging=dev", "cfg:app_mode=development"]
] ]
watch_all = true watch_all = true
follow_symlinks = true follow_symlinks = true
@ -18,5 +18,5 @@ build_delay = 1500
cmds = [ cmds = [
["GO_BUILD_DEV=1", "make", "build-go"], ["GO_BUILD_DEV=1", "make", "build-go"],
["make", "gen-jsonnet"], ["make", "gen-jsonnet"],
["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"] ["./bin/grafana", "server", "-profile", "-profile-addr=127.0.0.1", "-profile-port=6000", "-packaging=dev", "cfg:app_mode=development"]
] ]

4
Makefile
View File

@ -216,13 +216,13 @@ build-plugin-go: ## Build decoupled plugins
build: build-go build-js ## Build backend and frontend. build: build-go build-js ## Build backend and frontend.
.PHONY: run .PHONY: run
run: $(BRA) ## Build and run web server on filesystem changes. run: $(BRA) ## Build and run web server on filesystem changes. See /.bra.toml for configuration.
$(BRA) run $(BRA) run
.PHONY: run-go .PHONY: run-go
run-go: ## Build and run web server immediately. run-go: ## Build and run web server immediately.
$(GO) run -race $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS)) \ $(GO) run -race $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS)) \
./pkg/cmd/grafana -- server -packaging=dev cfg:app_mode=development ./pkg/cmd/grafana -- server -profile -profile-addr=127.0.0.1 -profile-port=6000 -packaging=dev cfg:app_mode=development
.PHONY: run-frontend .PHONY: run-frontend
run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild