Skip to content

Commit 4fdd4fb

Browse files
lunny6543
andauthored
Add more test directory to exclude dir of air, remove watching templates from air include dir because gitea has internal mechanism (#22246) (#22247)
backport #22246 Since #20218 introduced internal watching template, template watching should be removed from `air`. This will prevent restart the whole server once the template files changed to speed up developing when using `make watch`. To ensure `make watch` will reuse template watching, this PR introduced a new ENV `GITEA_RUN_MODE` to make sure `make watch` will always run in a dev mode of Gitea so that template watching will open. This PR also added more exclude testdata directories. Co-authored-by: 6543 <[email protected]>
1 parent 900e158 commit 4fdd4fb

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.air.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ tmp_dir = ".air"
55
cmd = "make backend"
66
bin = "gitea"
77
include_ext = ["go", "tmpl"]
8-
exclude_dir = ["modules/git/tests", "services/gitdiff/testdata", "modules/avatar/testdata"]
9-
include_dir = ["cmd", "models", "modules", "options", "routers", "services", "templates"]
8+
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"]
9+
include_dir = ["cmd", "models", "modules", "options", "routers", "services"]
1010
exclude_regex = ["_test.go$", "_gen.go$"]

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ watch-frontend: node-check node_modules
358358

359359
.PHONY: watch-backend
360360
watch-backend: go-check
361-
$(GO) run $(AIR_PACKAGE) -c .air.toml
361+
GITEA_RUN_MODE=dev $(GO) run $(AIR_PACKAGE) -c .air.toml
362362

363363
.PHONY: test
364364
test: test-frontend test-backend

modules/setting/setting.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,10 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
10391039
// The following is a purposefully undocumented option. Please do not run Gitea as root. It will only cause future headaches.
10401040
// Please don't use root as a bandaid to "fix" something that is broken, instead the broken thing should instead be fixed properly.
10411041
unsafeAllowRunAsRoot := Cfg.Section("").Key("I_AM_BEING_UNSAFE_RUNNING_AS_ROOT").MustBool(false)
1042-
RunMode = Cfg.Section("").Key("RUN_MODE").MustString("prod")
1042+
RunMode = os.Getenv("GITEA_RUN_MODE")
1043+
if RunMode == "" {
1044+
RunMode = Cfg.Section("").Key("RUN_MODE").MustString("prod")
1045+
}
10431046
IsProd = strings.EqualFold(RunMode, "prod")
10441047
// Does not check run user when the install lock is off.
10451048
if InstallLock {

0 commit comments

Comments
 (0)