Merge branch 'master-1'
# Conflicts: # cmd/pkgdashcli/main.go # go.mod # go.sum # internal/cli/init.go # internal/source/gitea/gitea.go
This commit is contained in:
@@ -94,12 +94,11 @@ func pkgdashcli() {
|
||||
|
||||
for _, configDir := range configDirs {
|
||||
for _, configFile := range configFiles {
|
||||
logger.Info(ctx, fmt.Sprintf("path: %s", filepath.Join(configDir, configFile)))
|
||||
c := fileconfig.NewConfig(
|
||||
config.AllowFail(false),
|
||||
config.Struct(cfg),
|
||||
options.Codec(yamlcodec.NewCodec()),
|
||||
fileconfig.Path(".gitea/pkgdashcli.yaml"),
|
||||
fileconfig.Path(filepath.Join(configDir, configFile)),
|
||||
)
|
||||
err = c.Init(options.Context(ctx))
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user