Skip to content

Commit

Permalink
Merge branch 'michael-kotliar-static_checker_bug' into v1.0-errata
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Amstutz committed Jul 23, 2017
2 parents eb12fae + 4294b6d commit 9026a00
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
8 changes: 8 additions & 0 deletions v1.0/conformance_test_v1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1109,3 +1109,11 @@
output: {}
tool: v1.0/initialwork-path.cwl
doc: Test that file path in $(inputs) for initialworkdir is in $(outdir).

- job: v1.0/count-lines6-job.json
output:
count_output: 34
tool: v1.0/count-lines12-wf.cwl
doc: |
Test single step workflow with Scatter step and two data links connected to
same input, flattened merge behavior. Workflow inputs are set as list
27 changes: 27 additions & 0 deletions v1.0/v1.0/count-lines12-wf.cwl
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env cwl-runner
class: Workflow
cwlVersion: v1.0
requirements:
- class: MultipleInputFeatureRequirement

inputs:
file1:
- type: array
items: File
file2:
- type: array
items: File

outputs:
count_output:
type: int
outputSource: step1/output

steps:
step1:
run: wc3-tool.cwl
in:
file1:
source: [file1, file2]
linkMerge: merge_flattened
out: [output]

0 comments on commit 9026a00

Please sign in to comment.