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

chore: log force quit stage name
Some checks failed
submodules sync / sync (push) Failing after 4s
Details
build / build (push) Successful in 1m30s
Details
build / trigger-build-image (push) Successful in 8s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2024-11-15 03:17:17 -05:00
parent c992ca383d
commit 79297a26f7
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/joj3/main.go
View File

@ -35,7 +35,7 @@ func init() {
func mainImpl() (err error) { func mainImpl() (err error) {
confObj := new(conf.Conf) confObj := new(conf.Conf)
var stageResults []internalStage.StageResult var stageResults []internalStage.StageResult
var stageForceQuit bool var forceQuitStageName string
var teapotResult teapot.TeapotResult var teapotResult teapot.TeapotResult
defer func() { defer func() {
actor := os.Getenv("GITHUB_ACTOR") actor := os.Getenv("GITHUB_ACTOR")
@ -52,7 +52,8 @@ func mainImpl() (err error) {
"joj3 summary", "joj3 summary",
"name", confObj.Name, "name", confObj.Name,
"totalScore", totalScore, "totalScore", totalScore,
"forceQuit", stageForceQuit, "forceQuit", forceQuitStageName != "",
"forceQuitStageName", forceQuitStageName,
"actor", actor, "actor", actor,
"repository", repository, "repository", repository,
"ref", ref, "ref", ref,
@ -110,7 +111,7 @@ func mainImpl() (err error) {
return err return err
} }
groups := conf.MatchGroups(confObj, conventionalCommit) groups := conf.MatchGroups(confObj, conventionalCommit)
stageResults, stageForceQuit, err = stage.Run(confObj, groups) stageResults, forceQuitStageName, err = stage.Run(confObj, groups)
if err != nil { if err != nil {
slog.Error("stage run", "error", err) slog.Error("stage run", "error", err)
} }
@ -123,9 +124,9 @@ func mainImpl() (err error) {
slog.Error("teapot run", "error", err) slog.Error("teapot run", "error", err)
return err return err
} }
if stageForceQuit { if forceQuitStageName != "" {
slog.Info("stage force quit") slog.Info("stage force quit", "name", forceQuitStageName)
return fmt.Errorf("stage force quit") return fmt.Errorf("stage force quit with name %s", forceQuitStageName)
} }
return nil return nil
} }

8
cmd/joj3/stage/run.go
View File

@ -132,7 +132,7 @@ func newErrorStageResults(err error) []stage.StageResult {
} }
func Run(conf *conf.Conf, groups []string) ( func Run(conf *conf.Conf, groups []string) (
stageResults []stage.StageResult, forceQuit bool, err error, stageResults []stage.StageResult, forceQuitStageName string, err error,
) { ) {
executors.InitWithConf( executors.InitWithConf(
conf.Stage.SandboxExecServer, conf.Stage.SandboxExecServer,
@ -142,15 +142,15 @@ func Run(conf *conf.Conf, groups []string) (
if err != nil { if err != nil {
slog.Error("generate stages", "error", err) slog.Error("generate stages", "error", err)
stageResults = newErrorStageResults(err) stageResults = newErrorStageResults(err)
forceQuit = true forceQuitStageName = "internal"
return return
} }
defer stage.Cleanup() defer stage.Cleanup()
stageResults, forceQuit, err = stage.Run(stages) stageResults, forceQuitStageName, err = stage.Run(stages)
if err != nil { if err != nil {
slog.Error("run stages", "error", err) slog.Error("run stages", "error", err)
stageResults = newErrorStageResults(err) stageResults = newErrorStageResults(err)
forceQuit = true forceQuitStageName = "internal"
return return
} }
return return

11
internal/stage/run.go
View File

@ -5,7 +5,9 @@ import (
"log/slog" "log/slog"
) )
func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error) { func Run(stages []Stage) (
stageResults []StageResult, forceQuitStageName string, err error,
) {
var executorResults []ExecutorResult var executorResults []ExecutorResult
var parserResults []ParserResult var parserResults []ParserResult
var tmpParserResults []ParserResult var tmpParserResults []ParserResult
@ -59,7 +61,6 @@ func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error)
"summary", SummarizeExecutorResults(executorResults), "summary", SummarizeExecutorResults(executorResults),
) )
parserResults = []ParserResult{} parserResults = []ParserResult{}
forceQuit = false
for _, stageParser := range stage.Parsers { for _, stageParser := range stage.Parsers {
slog.Info( slog.Info(
"parser run start", "parser run start",
@ -100,8 +101,8 @@ func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error)
"stageName", stage.Name, "stageName", stage.Name,
"name", stageParser.Name, "name", stageParser.Name,
) )
forceQuitStageName = stage.Name
} }
forceQuit = forceQuit || parserForceQuit
slog.Debug( slog.Debug(
"parser run done", "parser run done",
"stageName", stage.Name, "stageName", stage.Name,
@ -120,9 +121,9 @@ func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error)
stageResults = append(stageResults, StageResult{ stageResults = append(stageResults, StageResult{
Name: stage.Name, Name: stage.Name,
Results: parserResults, Results: parserResults,
ForceQuit: forceQuit, ForceQuit: forceQuitStageName != "",
}) })
if forceQuit { if forceQuitStageName != "" {
break break
} }
} }