From 7ad3a3ab1fb63d18987725ddefcbdbcb5aea1e21 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 29 Sep 2024 06:20:03 -0400 Subject: [PATCH] feat: accept all formats of meta-conf --- cmd/joj3/conf.go | 5 +---- cmd/joj3/main.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/joj3/conf.go b/cmd/joj3/conf.go index 8050a90..1d5b59a 100644 --- a/cmd/joj3/conf.go +++ b/cmd/joj3/conf.go @@ -87,10 +87,7 @@ func parseMetaConfFile(path string) (metaConf MetaConf, err error) { }, nil } d := &multiconfig.DefaultLoader{} - d.Loader = multiconfig.MultiLoader( - &multiconfig.TagLoader{}, - &multiconfig.JSONLoader{Path: path}, - ) + d.Loader = multiconfig.NewWithPath(path) d.Validator = multiconfig.MultiValidator(&multiconfig.RequiredValidator{}) if err = d.Load(&metaConf); err != nil { slog.Error("parse meta conf", "error", err) diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go index 65e03bd..1862f22 100644 --- a/cmd/joj3/main.go +++ b/cmd/joj3/main.go @@ -95,7 +95,7 @@ var ( ) 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") }