From 000910afb9fd586a4f9da7fa74165f84c6300349 Mon Sep 17 00:00:00 2001 From: jdidion Date: Mon, 24 Jan 2022 09:10:44 -0800 Subject: [PATCH 1/3] make workflow output types optional; addresses #146, #147 --- tests/conditionals/cond-wf-002.cwl | 2 +- tests/conditionals/cond-wf-002_nojs.cwl | 2 +- tests/conditionals/cond-wf-011.cwl | 2 +- tests/conditionals/cond-wf-011_nojs.cwl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/conditionals/cond-wf-002.cwl b/tests/conditionals/cond-wf-002.cwl index 7549a5fb..de1e9793 100644 --- a/tests/conditionals/cond-wf-002.cwl +++ b/tests/conditionals/cond-wf-002.cwl @@ -15,7 +15,7 @@ steps: outputs: out1: - type: string + type: string? outputSource: step1/out1 requirements: diff --git a/tests/conditionals/cond-wf-002_nojs.cwl b/tests/conditionals/cond-wf-002_nojs.cwl index e5ee4b5e..4f3d7da6 100644 --- a/tests/conditionals/cond-wf-002_nojs.cwl +++ b/tests/conditionals/cond-wf-002_nojs.cwl @@ -18,5 +18,5 @@ steps: outputs: out1: - type: string + type: string? outputSource: step1/out1 diff --git a/tests/conditionals/cond-wf-011.cwl b/tests/conditionals/cond-wf-011.cwl index cf99cc85..8adaf212 100644 --- a/tests/conditionals/cond-wf-011.cwl +++ b/tests/conditionals/cond-wf-011.cwl @@ -26,7 +26,7 @@ outputs: type: array items: type: array - items: string + items: string? outputSource: step1/out1 pickValue: all_non_null diff --git a/tests/conditionals/cond-wf-011_nojs.cwl b/tests/conditionals/cond-wf-011_nojs.cwl index 21c3e0e7..901d5148 100644 --- a/tests/conditionals/cond-wf-011_nojs.cwl +++ b/tests/conditionals/cond-wf-011_nojs.cwl @@ -36,7 +36,7 @@ outputs: type: array items: type: array - items: string + items: string? outputSource: step1/out1 pickValue: all_non_null From 4e1ade2462b2bf1a1cd89ea57df73c4ac4c6af11 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Tue, 25 Jan 2022 18:27:57 +0100 Subject: [PATCH 2/3] validation warning won't be issued anymore --- tests/conditionals/test-index.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/conditionals/test-index.yaml b/tests/conditionals/test-index.yaml index 6b7d8c48..d6dfa65e 100644 --- a/tests/conditionals/test-index.yaml +++ b/tests/conditionals/test-index.yaml @@ -23,7 +23,6 @@ - id: cond-3 label: direct_required - doc: Should give validation warning because of required sink tool: cond-wf-002.cwl job: val.1.job.yaml output: @@ -230,7 +229,6 @@ - id: cond-3_nojs label: direct_required_nojs - doc: Should give validation warning because of required sink, no javascript tool: cond-wf-002_nojs.cwl job: val.1.job.yaml output: From 8ce1d1a61557201da096e8b931db8a26f5182552 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Tue, 25 Jan 2022 18:48:07 +0100 Subject: [PATCH 3/3] correct syntax for items field --- tests/conditionals/cond-wf-011.cwl | 2 +- tests/conditionals/cond-wf-011_nojs.cwl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conditionals/cond-wf-011.cwl b/tests/conditionals/cond-wf-011.cwl index 8adaf212..d05554d4 100644 --- a/tests/conditionals/cond-wf-011.cwl +++ b/tests/conditionals/cond-wf-011.cwl @@ -26,7 +26,7 @@ outputs: type: array items: type: array - items: string? + items: [string, 'null'] outputSource: step1/out1 pickValue: all_non_null diff --git a/tests/conditionals/cond-wf-011_nojs.cwl b/tests/conditionals/cond-wf-011_nojs.cwl index 901d5148..deca8cc2 100644 --- a/tests/conditionals/cond-wf-011_nojs.cwl +++ b/tests/conditionals/cond-wf-011_nojs.cwl @@ -36,7 +36,7 @@ outputs: type: array items: type: array - items: string? + items: [string, 'null'] outputSource: step1/out1 pickValue: all_non_null