Merge branch 'main' into release-2.4.5

Author: jdidion

executorWdl/src/test/scala/dx/executor/wdl/TaskExecutorTest.scala

@@ -275,7 +275,7 @@ class TaskExecutorTest extends AnyFlatSpec with Matchers {
                       useManifests)
 
     // create TaskExecutor
-    (WdlTaskExecutor.create(jobMeta, streamFiles = streamFiles), jobMeta)
+    (WdlTaskExecutor.create(jobMeta, streamFiles = streamFiles, waitOnUpload = false), jobMeta)
   }
 
   // Parse the WDL source code, extract the single task that is supposed to be there,

scripts/run_tests.py

@@ -243,7 +243,8 @@
     "hello",
     "path_not_taken",
     "optionals",
-    "shapes"
+    "shapes",
+    #"population"
 ]
 test_project_wide_reuse = ['add2', "add_many"]
 

test/struct/runtime_vs_static_type.wdl

@@ -8,7 +8,7 @@ struct WordStruct {
 workflow runtime_vs_static_type {
     call opt_int { input: x = 14 }
 
-    call opt_array { input: xa = [14,15,20] }
+    call opt_array2 { input: xa = [14,15,20] }
 
     WordStruct manitoba = object {
         word: "Manitoba",
@@ -19,7 +19,7 @@ workflow runtime_vs_static_type {
 
     output {
         Int result = opt_int.result
-        String result2 = opt_array.numbers
+        String result2 = opt_array2.numbers
         String result3 = opt_struct.w
     }
 }
@@ -37,7 +37,7 @@ task opt_int {
 }
 
 
-task opt_array {
+task opt_array2 {
     input {
         Array[Int?] xa
     }

test/upload_file/upload_file.wdl

@@ -0,0 +1,20 @@
+version 1.1
+
+task upload_task {
+  command <<<
+  set -euxo pipefail
+  echo "A" > output.txt
+  >>>
+
+  output {
+    File output_f = "output.txt"
+  }
+}
+
+workflow upload_wf {
+  call upload_task
+
+  output {
+    File output_f = upload_task.output_f
+  }
+}