Fix output from download-models.cwl

hubmapconsortium · Oct 23, 2023 · 1da5f14 · 1da5f14
1 parent 2121eb3
commit 1da5f14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/download-models.cwl b/download-models.cwl
@@ -16,22 +16,23 @@ inputs:
 
 outputs:
   data:
-    type: Directory[]
-    outputSource: [downloadAzimuth/data, downloadPopv/data]
+    type: Directory
+    outputSource: collectFiles/directory
 
 steps:
   downloadAzimuth:
     run: ./containers/azimuth/download-data.cwl
-    in:
-      outputDirectory:
-        source: outputDirectory
-        valueFrom: $(self + '/azimuth')
+    in: []
     out: [data]
 
   downloadPopv:
     run: ./containers/popv/download-data.cwl
-    in:
-      outputDirectory:
-        source: outputDirectory
-        valueFrom: $(self + '/popv')
+    in: []
     out: [data]
+
+  collectFiles:
+    run: ./steps/collect-files.cwl
+    in:
+      files: [downloadAzimuth/data, downloadPopv/data]
+      outputDirectory: outputDirectory
+    out: [directory]
diff --git a/steps/collect-files.cwl b/steps/collect-files.cwl
@@ -7,7 +7,12 @@ requirements:
   MultipleInputFeatureRequirement: {}
 
 inputs:
-  files: File[]
+  files:
+    type:
+      type: array
+      items:
+        - File
+        - Directory
   outputDirectory: string
 outputs:
   directory: Directory