Skip to content

Commit b7b28d9

Browse files
committed
fix: nil pointer when serial/parallel child is not an exec type
1 parent 2e8a0f0 commit b7b28d9

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

internal/runner/serial/serial.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ func handleExec(
112112
maps.Copy(execPromptedEnv, a)
113113
}
114114
fields := map[string]interface{}{"step": exec.ID()}
115-
exec.Exec.SetLogFields(fields)
115+
if exec.Exec != nil {
116+
exec.Exec.SetLogFields(fields)
117+
}
116118

117119
runExec := func() error {
118120
return runSerialExecFunc(ctx, i, refConfig, exec, eng, execPromptedEnv, serialSpec)

internal/templates/templates.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,12 @@ func runExecutables(
164164
}
165165
maps.Copy(execEnv, a)
166166
}
167-
exec.Exec.SetLogFields(map[string]interface{}{
168-
"stage": stage,
169-
"step": i + 1,
170-
})
167+
if exec.Exec != nil {
168+
exec.Exec.SetLogFields(map[string]interface{}{
169+
"stage": stage,
170+
"step": i + 1,
171+
})
172+
}
171173
if err := runner.Exec(ctx, exec, engine.NewExecEngine(), execEnv); err != nil {
172174
return errors.Wrap(err, fmt.Sprintf("unable to execute %s executable %d", stage, i))
173175
}

0 commit comments

Comments
 (0)