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

This commit is contained in:
张泊明518370910136 2024-11-15 03:17:17 -05:00
parent c992ca383d
commit 79297a26f7
GPG Key ID: D47306D7062CDA9D
3 changed files with 17 additions and 15 deletions

View File

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

View File

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

View File

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