mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-03 22:52:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

do not run initDB within integration tests

Browse source
This commit is contained in:
Earl Warren 2023-03-09 14:46:23 +01:00
parent 6621b04458
commit 5a0428ede3
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmd/actions.go
View file

@ -9,7 +9,6 @@ import (
"log" "log"
actions_model "code.gitea.io/gitea/models/actions" actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/util"
@ -30,18 +29,20 @@ var CmdActions = cli.Command{
}, },
} }
func maybeInitDB(stdCtx context.Context) error {
if setting.Database.Type == "" {
if err := initDB(stdCtx); err != nil {
return err
}
}
return nil
}
func runActions(ctx *cli.Context) error { func runActions(ctx *cli.Context) error {
setting.InitProviderFromExistingFile() stdCtx := context.Background()
setting.LoadCommonSettings()
setting.LoadDBSetting()
stdCtx, cancel := installSignals() if err := maybeInitDB(stdCtx); err != nil {
defer cancel() log.Fatalf("maybeInitDB %v", err)
if err := db.InitEngine(stdCtx); err != nil {
fmt.Println(err)
fmt.Println("Check if you are using the right config file. You can use a --config directive to specify one.")
return nil
} }
if ctx.Bool("registration-token-admin") { if ctx.Bool("registration-token-admin") {