Skip to content

Commit 4294b6d

Browse files
author
Peter Amstutz
committed
Merge branch 'static_checker_bug' of https://github.com/michael-kotliar/common-workflow-language into michael-kotliar-static_checker_bug
2 parents c50c150 + 99eae75 commit 4294b6d

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

v1.0/conformance_test_v1.0.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,4 +995,12 @@
995995
args: [-A,'2',-B,baz,-C,'10','9','8','7','6','5','4','3','2','1']
996996
job: v1.0/empty.json
997997
tool: v1.0/inline-js.cwl
998-
doc: Test InlineJavascriptRequirement with multiple expressions in the same tool
998+
doc: Test InlineJavascriptRequirement with multiple expressions in the same tool
999+
1000+
- job: v1.0/count-lines6-job.json
1001+
output:
1002+
count_output: 34
1003+
tool: v1.0/count-lines11-wf.cwl
1004+
doc: |
1005+
Test single step workflow with Scatter step and two data links connected to
1006+
same input, flattened merge behavior. Workflow inputs are set as list

v1.0/v1.0/count-lines11-wf.cwl

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/usr/bin/env cwl-runner
2+
class: Workflow
3+
cwlVersion: v1.0
4+
5+
requirements:
6+
- class: MultipleInputFeatureRequirement
7+
8+
inputs:
9+
file1:
10+
- type: array
11+
items: File
12+
file2:
13+
- type: array
14+
items: File
15+
16+
outputs:
17+
count_output:
18+
type: int
19+
outputSource: step1/output
20+
21+
steps:
22+
step1:
23+
run: wc3-tool.cwl
24+
in:
25+
file1:
26+
source: [file1, file2]
27+
linkMerge: merge_flattened
28+
out: [output]

0 commit comments

Comments
 (0)