@@ -330,22 +330,28 @@ def _validate_step_command(
330
330
# If the returned boolean is False then we can expect the returned str
331
331
# to contain an error message.
332
332
#
333
- # Remember that variables can exist in the specification too!
334
333
# The full set of step variables can be obtained
335
- # (in descending order of priority) from...
334
+ # (in ascending order of priority) from...
336
335
#
337
- # 1. The RunningWorkflow
338
- # 2. The Job Step Specification Variables
336
+ # 1. The Job Step Specification
337
+ # 2. The RunningWorkflow
339
338
#
340
339
# If variable 'x' is defined in all three then the RunningWorkflow's
341
340
# value must be used.
342
341
343
- # Get any variables from the step specification.
342
+ # 1. Get any variables from the step specification.
344
343
all_variables = step_spec .pop ("variables" ) if "variables" in step_spec else {}
345
- # Merge running workflow variables on top of these
344
+ # 2. Merge running workflow variables on top of these
346
345
if running_workflow_variables :
347
346
all_variables |= running_workflow_variables
348
347
348
+ # This gives all the running workflow and step-specific variables.
349
+ # Now we have to inspect the workflow step 'inputs' (and 'options')
350
+ # and see if there are further variables that need constructing
351
+ # and then adding (merging) into the 'all_variables' dictionary.
352
+ #
353
+ # TBD
354
+
349
355
message , success = decode (
350
356
job ["command" ], all_variables , "command" , TextEncoding .JINJA2_3_0
351
357
)
0 commit comments