JOJ/JOJ3
25
6
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: accept all formats of meta-conf
All checks were successful
build-image / create-empty-commit (push) Successful in 6s
Details
checks / build (push) Successful in 1m25s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2024-09-29 06:20:03 -04:00
parent 03065b0b69
commit 7ad3a3ab1f
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/joj3/conf.go
View File

@ -87,10 +87,7 @@ func parseMetaConfFile(path string) (metaConf MetaConf, err error) {
}, nil }, nil
} }
d := &multiconfig.DefaultLoader{} d := &multiconfig.DefaultLoader{}
d.Loader = multiconfig.MultiLoader( d.Loader = multiconfig.NewWithPath(path)
&multiconfig.TagLoader{},
&multiconfig.JSONLoader{Path: path},
)
d.Validator = multiconfig.MultiValidator(&multiconfig.RequiredValidator{}) d.Validator = multiconfig.MultiValidator(&multiconfig.RequiredValidator{})
if err = d.Load(&metaConf); err != nil { if err = d.Load(&metaConf); err != nil {
slog.Error("parse meta conf", "error", err) slog.Error("parse meta conf", "error", err)

2
cmd/joj3/main.go
View File

@ -95,7 +95,7 @@ var (
) )
func init() { func init() {
flag.StringVar(&metaConfPath, "meta-conf", "meta-conf.json", "meta config file path") flag.StringVar(&metaConfPath, "meta-conf", "meta-conf.toml", "meta config file path")
flag.StringVar(&msg, "msg", "", "message to trigger the running, leave empty to use git commit message on HEAD") flag.StringVar(&msg, "msg", "", "message to trigger the running, leave empty to use git commit message on HEAD")
} }