Skip to content

Commit 4022b92

Browse files
committed
Report rendered steps
1 parent e987848 commit 4022b92

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

internal/campaigns/run_steps.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ func runSteps(ctx context.Context, wc *WorkspaceCreator, repo *graphql.Repositor
6565

6666
for i, step := range steps {
6767
logger.Logf("[Step %d] docker run %s %q", i+1, step.Container, step.Run)
68-
reportProgress(step.Run)
6968

7069
cidFile, err := ioutil.TempFile(tempDir, repo.Slug()+"-container-id")
7170
if err != nil {
@@ -101,16 +100,20 @@ func runSteps(ctx context.Context, wc *WorkspaceCreator, repo *graphql.Repositor
101100
if i > 0 {
102101
stepContext.PreviousStep = results[i-1]
103102
}
103+
104104
tmpl, err := parseStepRun(stepContext, step.Run)
105105
if err != nil {
106106
return nil, errors.Wrap(err, "parsing step run")
107107
}
108108

109-
if err := tmpl.Execute(fp, stepContext); err != nil {
109+
var buf bytes.Buffer
110+
if err := tmpl.Execute(io.MultiWriter(&buf, fp), stepContext); err != nil {
110111
return nil, errors.Wrap(err, "executing template")
111112
}
112113
fp.Close()
113114

115+
reportProgress(buf.String())
116+
114117
const workDir = "/work"
115118
cmd := exec.CommandContext(ctx, "docker", "run",
116119
"--rm",

0 commit comments

Comments
 (0)