supports catch error/continue

Author: mohemohe

lib/v1/executor.go

@@ -47,17 +47,19 @@ type (
 		FinalizeWindows   *Step `yaml:"finalize_windows,omitempty"`
 	}
 	Step struct {
-		Name *string  `yaml:"name"`
-		Use  string   `yaml:"use"`
-		Cmd  string   `yaml:"cmd"`
-		Dir  string   `yaml:"dir"`
-		Env  []string `yaml:"env"`
-		If   []If     `yaml:"if"`
+		Name        *string  `yaml:"name"`
+		Use         string   `yaml:"use"`
+		Cmd         string   `yaml:"cmd"`
+		Dir         string   `yaml:"dir"`
+		Env         []string `yaml:"env"`
+		If          []If     `yaml:"if"`
+		IgnoreError bool     `yaml:"ignore_error" mapstructure:"ignore_error"`
 	}
 	If struct {
 		Directory *IfExists `yaml:"directory,omitempty"`
 		File      *IfExists `yaml:"file,omitempty"`
 		Env       *[]string `yarl:"env,omitempty"`
+		IsError   *bool     `yaml:"is_error,omitempty" mapstructure:"is_error"`
 	}
 	IfExists struct {
 		Exists  *string `yaml:"exists,omitempty"`
@@ -345,6 +347,7 @@ func (e *Executor) finalizePlugins() (result error) {
 
 func (e *Executor) runJob(name string, job *Job) (result error) {
 	util.LogInfo("[lscbuild] start job: %s\n", name)
+	util.LogDebug("[lscbuild] job: %+v\n", job)
 	defer func() {
 		if err := recover(); err != nil {
 			switch e := err.(type) {
@@ -374,6 +377,15 @@ func (e *Executor) runJob(name string, job *Job) (result error) {
 	}
 
 	for _, step := range job.Steps {
+		if result != nil && !step.IsError() {
+			util.LogInfo("[lscbuild] skip step: %s\n", e.stepName(&step))
+			continue
+		}
+		if result == nil && step.IsError() {
+			util.LogInfo("[lscbuild] skip step: %s\n", e.stepName(&step))
+			continue
+		}
+
 		if step.Use != "" {
 			parsed := e.parsePluginUse(step.Use)
 			cache := e.pluginCache[parsed.GitRepo]
@@ -389,15 +401,13 @@ func (e *Executor) runJob(name string, job *Job) (result error) {
 				newStep.Env = append(newStep.Env, "LSCBUILD_CWD="+cwd)
 
 				result = e.runStep(job, &newStep)
-				if result != nil {
-					return result
-				}
 			}
 		} else {
 			result = e.runStep(job, &step)
-			if result != nil {
-				return result
-			}
+		}
+
+		if step.IgnoreError {
+			result = nil
 		}
 	}
 
@@ -519,6 +529,9 @@ func (e *Executor) runStep(job *Job, step *Step) (result error) {
 	cmd.Stderr = os.Stderr
 
 	util.LogInfo("[lscbuild] start step: %s\n", stepName)
+	defer func() {
+		util.LogInfo("[lscbuild] end step: %s, exit status: %d\n", stepName, cmd.ProcessState.ExitCode())
+	}()
 
 	if err := cmd.Start(); err != nil {
 		result = err
@@ -529,11 +542,21 @@ func (e *Executor) runStep(job *Job, step *Step) (result error) {
 		return result
 	}
 
-	util.LogInfo("[lscbuild] end step: %s\n", stepName)
-
 	return result
 }
 
+func (s *Step) IsError() bool {
+	if s.If == nil {
+		return false
+	}
+	for _, i := range s.If {
+		if i.IsError != nil && *i.IsError {
+			return true
+		}
+	}
+	return false
+}
+
 func (s *Step) MustCopy() Step {
 	// FIXME: slow zone
 

sample.lscbuild.yaml

@@ -96,3 +96,22 @@ jobs:
       - cmd: echo ok && exit 0
       - cmd: echo error && exit 1
       - cmd: echo not exec
+
+  test11:
+    steps:
+      - cmd: echo ok1
+      - cmd: invalidcommand
+        ignore_error: true
+      - cmd: echo skipped
+        if:
+          - is_error: true
+      - cmd: echo ok2
+
+  test12:
+    steps:
+      - cmd: echo ok1
+      - cmd: invalidcommand
+      - cmd: echo skip
+      - cmd: echo ok2
+        if:
+          - is_error: true

util/log.go

@@ -25,7 +25,7 @@ func isDebug() bool {
 	if cacheIsDebug == nil {
 		_, ok := lo.Find(os.Environ(), func(s string) bool {
 			split := strings.Split(s, "=")
-			return split[0] == "LSCBUILD_DEBUG" && split[1] != "" && split[1] != "0"
+			return split[0] == "LSCBUILD_DEBUG" && split[1] != "" && split[1] != "0" && split[1] != "false"
 		})
 		cacheIsDebug = &ok
 	}