Skip to content

Commit 9026a00

Browse files
author
Peter Amstutz
committed
Merge branch 'michael-kotliar-static_checker_bug' into v1.0-errata
2 parents eb12fae + 4294b6d commit 9026a00

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

v1.0/conformance_test_v1.0.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,3 +1109,11 @@
11091109
output: {}
11101110
tool: v1.0/initialwork-path.cwl
11111111
doc: Test that file path in $(inputs) for initialworkdir is in $(outdir).
1112+
1113+
- job: v1.0/count-lines6-job.json
1114+
output:
1115+
count_output: 34
1116+
tool: v1.0/count-lines12-wf.cwl
1117+
doc: |
1118+
Test single step workflow with Scatter step and two data links connected to
1119+
same input, flattened merge behavior. Workflow inputs are set as list

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

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

0 commit comments

Comments
 (0)