Skip to content

Commit dff56fa

Browse files
sebastianrathsebastianrath
committed
Update e2e tests
1 parent 146b788 commit dff56fa

12 files changed

Lines changed: 100 additions & 113 deletions

‎nodes/docker-run@v1.go‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func (n *DockerNode) ExecuteImpl(c *core.ExecutionState, inputId core.InputId, p
245245
// Handle GITHUB_ENV and GITHUB_OUTPUT for GitHub workflows
246246
if c.IsGitHubWorkflow {
247247
ghContextParser := GhContextParser{}
248-
ghEnvs, err := ghContextParser.Parse(c, currentEnvMap)
248+
ghEnvs, ghOutputs, err := ghContextParser.Parse(c, currentEnvMap)
249249
if err != nil {
250250
return err
251251
}
@@ -254,28 +254,15 @@ func (n *DockerNode) ExecuteImpl(c *core.ExecutionState, inputId core.InputId, p
254254
maps.Copy(nextEnvMap, ghEnvs)
255255
c.SetContextEnvironMap(nextEnvMap)
256256

257-
// Parse GITHUB_OUTPUT file if it exists
258-
githubOutput := currentEnvMap["GITHUB_OUTPUT"]
259-
if githubOutput != "" {
260-
b, err := os.ReadFile(githubOutput)
261-
if err != nil {
262-
return core.CreateErr(c, err, "unable to read github output file")
263-
}
264-
265-
outputs, err := parseOutputFile(string(b))
257+
for key, value := range ghOutputs {
258+
err = n.SetOutputValue(c, core.OutputId(key), value, core.SetOutputValueOpts{
259+
NotExistsIsNoError: true,
260+
ForceSet: true,
261+
StringTypeHint: true,
262+
})
266263
if err != nil {
267264
return err
268265
}
269-
for key, value := range outputs {
270-
err = n.SetOutputValue(c, core.OutputId(key), strings.TrimRight(value, "\t\n"), core.SetOutputValueOpts{
271-
NotExistsIsNoError: true,
272-
})
273-
if err != nil {
274-
return err
275-
}
276-
}
277-
278-
_ = os.Remove(githubOutput)
279266
}
280267
}
281268

‎tests_e2e/references/reference_app.sh_l12‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ hint:
2323

2424
stack trace:
2525
github.com/actionforge/actrun-cli/core.RunGraphFromFile
26-
graph.go:1089
26+
graph.go:1111
2727
github.com/actionforge/actrun-cli/cmd.cmdRootRun
2828
cmd_root.go:186
2929
github.com/spf13/cobra.(*Command).execute

‎tests_e2e/references/reference_dir-walk.sh_l56‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ stack trace:
3434
github.com/actionforge/actrun-cli/nodes.(*WalkNode).ExecuteImpl
3535
dir-walk@v1.go:61
3636
github.com/actionforge/actrun-cli/core.(*Executions).Execute
37-
executions.go:56
37+
executions.go:68
3838
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteImpl
3939
start@v1.go:50
4040
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteEntry
4141
start@v1.go:45
4242
github.com/actionforge/actrun-cli/core.RunGraph
43-
graph.go:484
43+
graph.go:506
4444
github.com/actionforge/actrun-cli/core.RunGraphFromString
45-
graph.go:1074
45+
graph.go:1096
4646
github.com/actionforge/actrun-cli/core.RunGraphFromFile
47-
graph.go:1092
47+
graph.go:1114
4848
github.com/actionforge/actrun-cli/cmd.cmdRootRun
4949
cmd_root.go:186
5050
github.com/spf13/cobra.(*Command).execute

‎tests_e2e/references/reference_error_no_output.sh_l8‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@ hint:
3333

3434
stack trace:
3535
github.com/actionforge/actrun-cli/core.(*Outputs).OutputValueById
36-
outputs.go:112
36+
outputs.go:114
3737
github.com/actionforge/actrun-cli/core.(*Inputs).InputValueById
3838
inputs.go:364
3939
github.com/actionforge/actrun-cli/core.inputValueById[...]
40-
inputs.go:478
40+
inputs.go:483
4141
github.com/actionforge/actrun-cli/core.InputValueFromSubInputs[...]
42-
inputs.go:473
42+
inputs.go:478
4343
github.com/actionforge/actrun-cli/core.InputArrayValueById[...]
44-
inputs.go:555
44+
inputs.go:560
4545
github.com/actionforge/actrun-cli/nodes.(*PrintNode).ExecuteImpl
4646
print@v1.go:27
4747
github.com/actionforge/actrun-cli/core.(*Executions).Execute
48-
executions.go:56
48+
executions.go:68
4949
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteImpl
5050
start@v1.go:50
5151
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteEntry
5252
start@v1.go:45
5353
github.com/actionforge/actrun-cli/core.RunGraph
54-
graph.go:484
54+
graph.go:506
5555
github.com/actionforge/actrun-cli/core.RunGraphFromString
56-
graph.go:1074
56+
graph.go:1096
5757
github.com/actionforge/actrun-cli/core.RunGraphFromFile
58-
graph.go:1092
58+
graph.go:1114
5959
github.com/actionforge/actrun-cli/cmd.cmdRootRun
6060
cmd_root.go:186
6161
github.com/spf13/cobra.(*Command).execute

‎tests_e2e/references/reference_group-error.sh_l8‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -126,131 +126,131 @@ error:
126126

127127
stack trace:
128128
github.com/actionforge/actrun-cli/nodes.runAndCaptureOutput
129-
run@v1.go:384
129+
run@v1.go:393
130130
github.com/actionforge/actrun-cli/nodes.runCommand
131-
run@v1.go:260
131+
run@v1.go:269
132132
github.com/actionforge/actrun-cli/nodes.(*RunNode).ExecuteImpl
133-
run@v1.go:112
133+
run@v1.go:110
134134
github.com/actionforge/actrun-cli/core.(*Executions).Execute
135-
executions.go:56
135+
executions.go:68
136136
github.com/actionforge/actrun-cli/nodes.(*GroupInputsNode).ExecuteImpl
137137
group-inputs@v1.go:39
138138
github.com/actionforge/actrun-cli/core.(*Executions).Execute
139-
executions.go:56
139+
executions.go:68
140140
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
141141
group@v1.go:102
142142
github.com/actionforge/actrun-cli/core.(*Executions).Execute
143-
executions.go:56
143+
executions.go:68
144144
github.com/actionforge/actrun-cli/nodes.(*PrintNode).ExecuteImpl
145145
print@v1.go:103
146146
github.com/actionforge/actrun-cli/core.(*Executions).Execute
147-
executions.go:56
147+
executions.go:68
148148
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
149149
group@v1.go:102
150150
github.com/actionforge/actrun-cli/core.(*Executions).Execute
151-
executions.go:56
151+
executions.go:68
152152
github.com/actionforge/actrun-cli/nodes.(*GroupOutputsNode).ExecuteImpl
153153
group-outputs@v1.go:30
154154
github.com/actionforge/actrun-cli/core.(*Executions).Execute
155-
executions.go:56
155+
executions.go:68
156156
github.com/actionforge/actrun-cli/nodes.(*RunNode).ExecuteImpl
157-
run@v1.go:129
157+
run@v1.go:127
158158
github.com/actionforge/actrun-cli/core.(*Executions).Execute
159-
executions.go:56
159+
executions.go:68
160160
github.com/actionforge/actrun-cli/nodes.(*GroupInputsNode).ExecuteImpl
161161
group-inputs@v1.go:39
162162
github.com/actionforge/actrun-cli/core.(*Executions).Execute
163-
executions.go:56
163+
executions.go:68
164164
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
165165
group@v1.go:102
166166
github.com/actionforge/actrun-cli/core.(*Executions).Execute
167-
executions.go:56
167+
executions.go:68
168168
github.com/actionforge/actrun-cli/nodes.(*PrintNode).ExecuteImpl
169169
print@v1.go:103
170170
github.com/actionforge/actrun-cli/core.(*Executions).Execute
171-
executions.go:56
171+
executions.go:68
172172
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
173173
group@v1.go:102
174174
github.com/actionforge/actrun-cli/core.(*Executions).Execute
175-
executions.go:56
175+
executions.go:68
176176
github.com/actionforge/actrun-cli/nodes.(*GroupOutputsNode).ExecuteImpl
177177
group-outputs@v1.go:30
178178
github.com/actionforge/actrun-cli/core.(*Executions).Execute
179-
executions.go:56
179+
executions.go:68
180180
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
181181
group@v1.go:102
182182
github.com/actionforge/actrun-cli/core.(*Executions).Execute
183-
executions.go:56
183+
executions.go:68
184184
github.com/actionforge/actrun-cli/nodes.(*GroupOutputsNode).ExecuteImpl
185185
group-outputs@v1.go:30
186186
github.com/actionforge/actrun-cli/core.(*Executions).Execute
187-
executions.go:56
187+
executions.go:68
188188
github.com/actionforge/actrun-cli/nodes.(*RunNode).ExecuteImpl
189-
run@v1.go:129
189+
run@v1.go:127
190190
github.com/actionforge/actrun-cli/core.(*Executions).Execute
191-
executions.go:56
191+
executions.go:68
192192
github.com/actionforge/actrun-cli/nodes.(*GroupInputsNode).ExecuteImpl
193193
group-inputs@v1.go:39
194194
github.com/actionforge/actrun-cli/core.(*Executions).Execute
195-
executions.go:56
195+
executions.go:68
196196
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
197197
group@v1.go:102
198198
github.com/actionforge/actrun-cli/core.(*Executions).Execute
199-
executions.go:56
199+
executions.go:68
200200
github.com/actionforge/actrun-cli/nodes.(*GroupInputsNode).ExecuteImpl
201201
group-inputs@v1.go:39
202202
github.com/actionforge/actrun-cli/core.(*Executions).Execute
203-
executions.go:56
203+
executions.go:68
204204
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
205205
group@v1.go:102
206206
github.com/actionforge/actrun-cli/core.(*Executions).Execute
207-
executions.go:56
207+
executions.go:68
208208
github.com/actionforge/actrun-cli/nodes.(*PrintNode).ExecuteImpl
209209
print@v1.go:103
210210
github.com/actionforge/actrun-cli/core.(*Executions).Execute
211-
executions.go:56
211+
executions.go:68
212212
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
213213
group@v1.go:102
214214
github.com/actionforge/actrun-cli/core.(*Executions).Execute
215-
executions.go:56
215+
executions.go:68
216216
github.com/actionforge/actrun-cli/nodes.(*GroupOutputsNode).ExecuteImpl
217217
group-outputs@v1.go:30
218218
github.com/actionforge/actrun-cli/core.(*Executions).Execute
219-
executions.go:56
219+
executions.go:68
220220
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
221221
group@v1.go:102
222222
github.com/actionforge/actrun-cli/core.(*Executions).Execute
223-
executions.go:56
223+
executions.go:68
224224
github.com/actionforge/actrun-cli/nodes.(*GroupOutputsNode).ExecuteImpl
225225
group-outputs@v1.go:30
226226
github.com/actionforge/actrun-cli/core.(*Executions).Execute
227-
executions.go:56
227+
executions.go:68
228228
github.com/actionforge/actrun-cli/nodes.(*RunNode).ExecuteImpl
229-
run@v1.go:146
229+
run@v1.go:155
230230
github.com/actionforge/actrun-cli/core.(*Executions).Execute
231-
executions.go:56
231+
executions.go:68
232232
github.com/actionforge/actrun-cli/nodes.(*GroupInputsNode).ExecuteImpl
233233
group-inputs@v1.go:39
234234
github.com/actionforge/actrun-cli/core.(*Executions).Execute
235-
executions.go:56
235+
executions.go:68
236236
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
237237
group@v1.go:102
238238
github.com/actionforge/actrun-cli/core.(*Executions).Execute
239-
executions.go:56
239+
executions.go:68
240240
github.com/actionforge/actrun-cli/nodes.(*GroupInputsNode).ExecuteImpl
241241
group-inputs@v1.go:39
242242
github.com/actionforge/actrun-cli/core.(*Executions).Execute
243-
executions.go:56
243+
executions.go:68
244244
github.com/actionforge/actrun-cli/nodes.(*GroupNode).ExecuteImpl
245245
group@v1.go:102
246246
github.com/actionforge/actrun-cli/core.(*Executions).Execute
247-
executions.go:56
247+
executions.go:68
248248
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteImpl
249249
start@v1.go:50
250250
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteEntry
251251
start@v1.go:45
252252
github.com/actionforge/actrun-cli/core.RunGraph
253-
graph.go:484
253+
graph.go:506
254254
github.com/actionforge/actrun-cli/core.RunGraphFromString
255-
graph.go:1074
255+
graph.go:1096
256256

‎tests_e2e/references/reference_group-port-collision.sh_l13‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ github.com/actionforge/actrun-cli/nodes.init.41.func1
2525
github.com/actionforge/actrun-cli/core.NewNodeInstance
2626
base.go:619
2727
github.com/actionforge/actrun-cli/core.LoadNode
28-
graph.go:657
28+
graph.go:679
2929
github.com/actionforge/actrun-cli/core.LoadNodes
30-
graph.go:597
30+
graph.go:619
3131
github.com/actionforge/actrun-cli/core.LoadGraph
32-
graph.go:512
32+
graph.go:534
3333
github.com/actionforge/actrun-cli/core.RunGraph
34-
graph.go:279
34+
graph.go:280
3535
github.com/actionforge/actrun-cli/core.RunGraphFromString
36-
graph.go:1074
36+
graph.go:1096
3737
github.com/actionforge/actrun-cli/core.RunGraphFromFile
38-
graph.go:1092
38+
graph.go:1114
3939
github.com/actionforge/actrun-cli/cmd.cmdRootRun
4040
cmd_root.go:186
4141
github.com/spf13/cobra.(*Command).execute

‎tests_e2e/references/reference_index.sh_l20‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,29 @@ github.com/actionforge/actrun-cli/nodes.(*ArrayGet).OutputValueById
6666
github.com/actionforge/actrun-cli/core.(*Inputs).InputValueById
6767
inputs.go:364
6868
github.com/actionforge/actrun-cli/core.inputValueById[...]
69-
inputs.go:478
69+
inputs.go:483
7070
github.com/actionforge/actrun-cli/core.InputValueFromSubInputs[...]
71-
inputs.go:473
71+
inputs.go:478
7272
github.com/actionforge/actrun-cli/core.InputArrayValueById[...]
73-
inputs.go:555
73+
inputs.go:560
7474
github.com/actionforge/actrun-cli/nodes.(*PrintNode).ExecuteImpl
7575
print@v1.go:27
7676
github.com/actionforge/actrun-cli/core.(*Executions).Execute
77-
executions.go:56
77+
executions.go:68
7878
github.com/actionforge/actrun-cli/nodes.(*LoopNode).ExecuteImpl
7979
for-loop@v1.go:54
8080
github.com/actionforge/actrun-cli/core.(*Executions).Execute
81-
executions.go:56
81+
executions.go:68
8282
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteImpl
8383
start@v1.go:50
8484
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteEntry
8585
start@v1.go:45
8686
github.com/actionforge/actrun-cli/core.RunGraph
87-
graph.go:484
87+
graph.go:506
8888
github.com/actionforge/actrun-cli/core.RunGraphFromString
89-
graph.go:1074
89+
graph.go:1096
9090
github.com/actionforge/actrun-cli/core.RunGraphFromFile
91-
graph.go:1092
91+
graph.go:1114
9292
github.com/actionforge/actrun-cli/cmd.cmdRootRun
9393
cmd_root.go:186
9494
github.com/spf13/cobra.(*Command).execute

‎tests_e2e/references/reference_run-python-embedded.sh_l13‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ github.com/actionforge/actrun-cli/nodes.init.52.func1
2929
github.com/actionforge/actrun-cli/core.NewNodeInstance
3030
base.go:619
3131
github.com/actionforge/actrun-cli/core.LoadNode
32-
graph.go:657
32+
graph.go:679
3333
github.com/actionforge/actrun-cli/core.LoadNodes
34-
graph.go:597
34+
graph.go:619
3535
github.com/actionforge/actrun-cli/core.LoadGraph
36-
graph.go:512
36+
graph.go:534
3737
github.com/actionforge/actrun-cli/core.RunGraph
38-
graph.go:279
38+
graph.go:280
3939
github.com/actionforge/actrun-cli/core.RunGraphFromString
40-
graph.go:1074
40+
graph.go:1096
4141
github.com/actionforge/actrun-cli/core.RunGraphFromFile
42-
graph.go:1092
42+
graph.go:1114
4343
github.com/actionforge/actrun-cli/cmd.cmdRootRun
4444
cmd_root.go:186
4545
github.com/spf13/cobra.(*Command).execute

‎tests_e2e/references/reference_s3_aws_walk.sh_l22‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ stack trace:
3838
github.com/actionforge/actrun-cli/nodes.(*StorageListNode).ExecuteImpl
3939
storage-walk@v1.go:45
4040
github.com/actionforge/actrun-cli/core.(*Executions).Execute
41-
executions.go:56
41+
executions.go:68
4242
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteImpl
4343
start@v1.go:50
4444
github.com/actionforge/actrun-cli/nodes.(*StartNode).ExecuteEntry
4545
start@v1.go:45
4646
github.com/actionforge/actrun-cli/core.RunGraph
47-
graph.go:484
47+
graph.go:506
4848
github.com/actionforge/actrun-cli/core.RunGraphFromString
49-
graph.go:1074
49+
graph.go:1096
5050
github.com/actionforge/actrun-cli/core.RunGraphFromFile
51-
graph.go:1092
51+
graph.go:1114
5252
github.com/actionforge/actrun-cli/cmd.cmdRootRun
5353
cmd_root.go:186
5454
github.com/spf13/cobra.(*Command).execute

0 commit comments

Comments
 (0)