Skip to content

Commit 90237d8

Browse files
authored
Add more test directory to exclude dir of air, remove watching templates from air include dir because gitea has internal mechanism (#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.
1 parent b48cf03 commit 90237d8

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.air.toml

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ watch-frontend: node-check node_modules
359359

360360
.PHONY: watch-backend
361361
watch-backend: go-check
362-
$(GO) run $(AIR_PACKAGE) -c .air.toml
362+
GITEA_RUN_MODE=dev $(GO) run $(AIR_PACKAGE) -c .air.toml
363363

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

modules/setting/setting.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,10 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
10431043
// The following is a purposefully undocumented option. Please do not run Gitea as root. It will only cause future headaches.
10441044
// Please don't use root as a bandaid to "fix" something that is broken, instead the broken thing should instead be fixed properly.
10451045
unsafeAllowRunAsRoot := Cfg.Section("").Key("I_AM_BEING_UNSAFE_RUNNING_AS_ROOT").MustBool(false)
1046-
RunMode = Cfg.Section("").Key("RUN_MODE").MustString("prod")
1046+
RunMode = os.Getenv("GITEA_RUN_MODE")
1047+
if RunMode == "" {
1048+
RunMode = Cfg.Section("").Key("RUN_MODE").MustString("prod")
1049+
}
10471050
IsProd = strings.EqualFold(RunMode, "prod")
10481051
// Does not check run user when the install lock is off.
10491052
if InstallLock {

0 commit comments

Comments
 (0)