Merge remote-tracking branch 'upstream/master'

Author: Luka Stojanovic

README.md

@@ -135,6 +135,7 @@ Conduct](https://github.com/common-workflow-language/common-workflow-language/bl
 * [Netherlands eScience Center](https://www.esciencecenter.nl/)
 * [Texas Advanced Computing Center Life Science Computing Group](https://www.tacc.utexas.edu/life-sciences-computing) / [Agave Platform](https://agaveapi.co/)
 * [CyVerse](http://www.cyverse.org/)
+* [Institute for Systems Biology](https://www.systemsbiology.org/)
 
 ## Individual Contributors
 
@@ -153,6 +154,7 @@ Conduct](https://github.com/common-workflow-language/common-workflow-language/bl
 * Dan Leehr <[email protected]>
 * Hervé Ménager <[email protected]>
 * Maxim Mikheev <[email protected]>
+* Michael Miller <[email protected]>
 * Tim Pierce <[email protected]>
 * Josh Randall <[email protected]>
 * Janko Simonović <[email protected]>

v1.0/conformance_test_v1.0.yaml

@@ -155,10 +155,10 @@
 - job: v1.0/wc-job.json
   output:
     output:
+      checksum: sha1$3596ea087bfdaf52380eae441077572ed289d657
       class: File
-      checksum: sha1$631bfbac524e2d04cdcc5ec33ade827fc10b06ae
       location: output
-      size: 15
+      size: 3
   tool: v1.0/wc-tool.cwl
   doc: Test command execution in with stdin and stdout redirection
 

v1.0/v1.0/wc-tool.cwl

@@ -11,7 +11,7 @@ outputs:
     type: File
     outputBinding: { glob: output }
 
-baseCommand: [wc]
+baseCommand: [wc, -l]
 
 stdin: $(inputs.file1.path)
 stdout: output

v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml

@@ -166,10 +166,10 @@
 - job: v1.1.0-dev1/wc-job.json
   output:
     output:
+      checksum: sha1$3596ea087bfdaf52380eae441077572ed289d657
       class: File
-      checksum: sha1$631bfbac524e2d04cdcc5ec33ade827fc10b06ae
       location: output
-      size: 15
+      size: 3
   tool: v1.1.0-dev1/wc-tool.cwl
   doc: Test command execution in with stdin and stdout redirection
 

v1.1.0-dev1/v1.1.0-dev1/wc-tool.cwl

@@ -11,7 +11,7 @@ outputs:
     type: File
     outputBinding: { glob: output }
 
-baseCommand: [wc]
+baseCommand: [wc, -l]
 
 stdin: $(inputs.file1.path)
 stdout: output