From f81581b928a63d41d17e429fe0ff841d7201ceac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 19 Jul 2024 19:38:17 +0800 Subject: [PATCH] revert: 27a2aac537d215f9d8bd055fa78d7b1391a50486 revert feat: return 1 on force quit --- cmd/joj3/main.go | 13 ++----------- internal/stage/run.go | 7 +++---- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go index 52da3fd..b8e0e05 100644 --- a/cmd/joj3/main.go +++ b/cmd/joj3/main.go @@ -71,26 +71,17 @@ func outputResult(conf Conf, results []stage.StageResult) error { } func main() { - retCode := 0 - defer func() { - os.Exit(retCode) - }() conf, err := commitMsgToConf() if err != nil { slog.Error("no conf found", "error", err) - retCode = 1 - return + os.Exit(1) } setupSlog(conf) executors.InitWithConf(conf.SandboxExecServer, conf.SandboxToken) stages := generateStages(conf) defer stage.Cleanup() - results, stageErr := stage.Run(stages) + results := stage.Run(stages) if err := outputResult(conf, results); err != nil { slog.Error("output result", "error", err) } - if stageErr != nil { - retCode = 1 - return - } } diff --git a/internal/stage/run.go b/internal/stage/run.go index 46a0218..670f666 100644 --- a/internal/stage/run.go +++ b/internal/stage/run.go @@ -1,11 +1,11 @@ package stage import ( - "errors" "log/slog" ) -func Run(stages []Stage) (stageResults []StageResult, stageErr error) { +func Run(stages []Stage) []StageResult { + stageResults := []StageResult{} for _, stage := range stages { slog.Debug("stage start", "name", stage.Name) slog.Debug("executor run start", "cmds", stage.ExecutorCmds) @@ -38,11 +38,10 @@ func Run(stages []Stage) (stageResults []StageResult, stageErr error) { ForceQuit: forceQuit, }) if forceQuit { - stageErr = errors.New("parser force quit") break } } - return + return stageResults } func Cleanup() {