Skip to content

Commit ac64307

Browse files
committed
"main" is good enough
1 parent 049a7c0 commit ac64307

File tree

4 files changed

+45
-4
lines changed

4 files changed

+45
-4
lines changed

concepts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,12 @@ of [process requirements](#Requirements_and_hints).
366366
The generic execution sequence of a CWL process (including workflows and
367367
command line line tools) is as follows.
368368

369-
1. Load, process and validate a CWL document, yielding one or more process objects.
370369
1. Load input object.
370+
1. Load, process and validate a CWL document, yielding one or more process objects.
371371
1. If there are multiple process objects (due to [`$graph`](SchemaSalad.html#Document_graph))
372372
and which process object to start with is not specified in the input object (via
373373
a [`cwl:tool`](#Executing_CWL_documents_as_scripts) entry) or by any other means
374-
(like a URL fragment) then choose the process with the `id` of "#main".
374+
(like a URL fragment) then choose the process with the `id` of "#main" or "main".
375375
1. Validate the input object against the `inputs` schema for the process.
376376
1. Validate process requirements are met.
377377
1. Perform any further setup required by the specific process type.

conformance_tests.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3209,3 +3209,13 @@
32093209
doc: Test use of $graph without specifying which process to run
32103210
tags: [ required, command_line_tool ]
32113211

3212+
- tool: tests/echo-tool-packed2.cwl
3213+
job: tests/env-job.json
3214+
output:
3215+
{"out": "hello test env\n"}
3216+
label: any_input_param_graph_no_default_hashmain
3217+
doc: |
3218+
Test use of $graph without specifying which process to run,
3219+
hash-prefixed "main"
3220+
tags: [ required, command_line_tool ]
3221+

tests/echo-tool-packed.cwl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cwlVersion: v1.1.0-dev1
2-
$graph:
2+
$graph:
33
- class: CommandLineTool
44
id: first
55
inputs:
@@ -15,7 +15,7 @@ $graph:
1515
baseCommand: [ echo, first ]
1616
stdout: out.txt
1717
- class: CommandLineTool
18-
id: '#main'
18+
id: main
1919
inputs:
2020
in:
2121
type: Any

tests/echo-tool-packed2.cwl

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
cwlVersion: v1.1.0-dev1
2+
$graph:
3+
- class: CommandLineTool
4+
id: first
5+
inputs:
6+
in:
7+
type: Any
8+
outputs:
9+
out:
10+
type: string
11+
outputBinding:
12+
glob: out.txt
13+
loadContents: true
14+
outputEval: $(self[0].contents)
15+
baseCommand: [ echo, first ]
16+
stdout: out.txt
17+
- class: CommandLineTool
18+
id: '#main'
19+
inputs:
20+
in:
21+
type: Any
22+
inputBinding: {}
23+
outputs:
24+
out:
25+
type: string
26+
outputBinding:
27+
glob: out.txt
28+
loadContents: true
29+
outputEval: $(self[0].contents)
30+
baseCommand: echo
31+
stdout: out.txt

0 commit comments

Comments
 (0)