fix: step error detection

common-creation · Dec 18, 2023 · 60b1e9d · 60b1e9d
1 parent 253636b
commit 60b1e9d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/v1/executor.go b/lib/v1/executor.go
@@ -364,7 +364,7 @@ func (e *Executor) runJob(name string, job *Job) (result error) {
 		if isWindows {
 			job.Shell = "cmd.exe /c"
 		} else {
-			job.Shell = "/bin/sh"
+			job.Shell = "/bin/sh -e"
 		}
 	}
 
@@ -388,10 +388,16 @@ func (e *Executor) runJob(name string, job *Job) (result error) {
 				}
 				newStep.Env = append(newStep.Env, "LSCBUILD_CWD="+cwd)
 
-				e.runStep(job, &newStep)
+				result = e.runStep(job, &newStep)
+				if result != nil {
+					return result
+				}
 			}
 		} else {
-			e.runStep(job, &step)
+			result = e.runStep(job, &step)
+			if result != nil {
+				return result
+			}
 		}
 	}
 

diff --git a/sample.lscbuild.yaml b/sample.lscbuild.yaml
@@ -89,3 +89,10 @@ jobs:
   test9:
     steps:
       - use: common-creation/lscbuild-plugin-sample
+
+  test10:
+    steps:
+      - cmd: echo ok
+      - cmd: echo ok && exit 0
+      - cmd: echo error && exit 1
+      - cmd: echo not exec