JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(cmd/joj3)!: conf #51

Merged
张泊明518370910136 merged 11 commits from conf into master 2024-10-12 13:21:59 +08:00
Conversation 0 Commits 11 Files Changed 6 +18 -16
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 459d1bf53d - Show all commits

34
cmd/joj3/conf/conf.go
View File

@ -160,22 +160,24 @@ func parseConfFile(path string) (conf Conf, err error) {
return return
} }
// TODO: remove the following backward compatibility codes // TODO: remove the following backward compatibility codes
conf.Stage.SandboxExecServer = conf.SandboxExecServer if len(conf.Stage.Stages) == 0 {
conf.Stage.SandboxToken = conf.SandboxToken conf.Stage.SandboxExecServer = conf.SandboxExecServer
conf.Stage.OutputPath = conf.OutputPath conf.Stage.SandboxToken = conf.SandboxToken
conf.Stage.Stages = make([]ConfStage, len(conf.Stages)) conf.Stage.OutputPath = conf.OutputPath
for i, stage := range conf.Stages { conf.Stage.Stages = make([]ConfStage, len(conf.Stages))
conf.Stage.Stages[i].Name = stage.Name for i, stage := range conf.Stages {
conf.Stage.Stages[i].Group = stage.Group conf.Stage.Stages[i].Name = stage.Name
conf.Stage.Stages[i].Executor = stage.Executor conf.Stage.Stages[i].Group = stage.Group
conf.Stage.Stages[i].Parsers = []struct { conf.Stage.Stages[i].Executor = stage.Executor
Name string conf.Stage.Stages[i].Parsers = []struct {
With interface{} Name string
}{ With interface{}
{ }{
Name: stage.Parser.Name, {
With: stage.Parser.With, Name: stage.Parser.Name,
}, With: stage.Parser.With,
},
}
} }
} }
return return