From 7257293edafe10b3038d9b536ad5f0725a667623 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 27 Dec 2022 09:01:28 +0800 Subject: [PATCH 1/2] add more test directory to exclude dir of air, remove watching templates from air include dir because gitea has internal mechanism --- .air.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.air.toml b/.air.toml index 0610088303179..069a88924388b 100644 --- a/.air.toml +++ b/.air.toml @@ -5,6 +5,6 @@ tmp_dir = ".air" cmd = "make backend" bin = "gitea" include_ext = ["go", "tmpl"] -exclude_dir = ["modules/git/tests", "services/gitdiff/testdata", "modules/avatar/testdata"] -include_dir = ["cmd", "models", "modules", "options", "routers", "services", "templates"] +exclude_dir = ["modules/git/tests", "services/gitdiff/testdata", "modules/avatar/testdata", "models/fixtures", "models/migrations/fixtures", "modules/migration/file_format_testdata", "modules/avatar/identicon/testdata"] +include_dir = ["cmd", "models", "modules", "options", "routers", "services"] exclude_regex = ["_test.go$", "_gen.go$"] From fad374f330b83db4c689695603dfd4dc7a7b1439 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 27 Dec 2022 09:35:37 +0800 Subject: [PATCH 2/2] make sure make watch run in dev mode of Gitea --- Makefile | 2 +- modules/setting/setting.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d1122984a7d8d..06a0d1c18e22d 100644 --- a/Makefile +++ b/Makefile @@ -359,7 +359,7 @@ watch-frontend: node-check node_modules .PHONY: watch-backend watch-backend: go-check - $(GO) run $(AIR_PACKAGE) -c .air.toml + GITEA_RUN_MODE=dev $(GO) run $(AIR_PACKAGE) -c .air.toml .PHONY: test test: test-frontend test-backend diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 47e0ae2cda1f5..07290fbfeb9f3 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1043,7 +1043,10 @@ func loadFromConf(allowEmpty bool, extraConfig string) { // The following is a purposefully undocumented option. Please do not run Gitea as root. It will only cause future headaches. // Please don't use root as a bandaid to "fix" something that is broken, instead the broken thing should instead be fixed properly. unsafeAllowRunAsRoot := Cfg.Section("").Key("I_AM_BEING_UNSAFE_RUNNING_AS_ROOT").MustBool(false) - RunMode = Cfg.Section("").Key("RUN_MODE").MustString("prod") + RunMode = os.Getenv("GITEA_RUN_MODE") + if RunMode == "" { + RunMode = Cfg.Section("").Key("RUN_MODE").MustString("prod") + } IsProd = strings.EqualFold(RunMode, "prod") // Does not check run user when the install lock is off. if InstallLock {