From afa04c62251f374a161a1b8a851fb36729008cef Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com> Date: Wed, 30 May 2018 10:02:31 +0300 Subject: [PATCH 1/4] Where parameter references are allowed --- _episodes/06-params.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/_episodes/06-params.md b/_episodes/06-params.md index 7f5c3ec1..f386c7ce 100644 --- a/_episodes/06-params.md +++ b/_episodes/06-params.md @@ -80,3 +80,30 @@ Note that because `File` parameters are objects, to get the path to an input file you must reference the path field on a file object; to reference the path to the tar file in the above example you would write `$(inputs.tarfile.path)`. + +> ## Where are parameter references allowed? +> You can only use parameter references in certain fields. These are: +> +> - [`arguments`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`coresMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`coresMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`entry`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) +> - [`entryname`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) +> - `format` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) +> - [`expression`](http://www.commonwl.org/v1.0/Workflow.html#ExpressionTool) +> - [`envValue`](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef) +> - [`glob`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) +> - [`listing`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement) +> - [`outdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`outdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`outputEval`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) +> - `secondaryFiles` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) +> - [`ramMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`ramMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`stdin`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`stdout`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`stderr`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`tmpdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`tmpdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - `valueFrom` (in a [CommandLineBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding), or [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput)) +{: .callout } From 2655e674a4be7e15e1f64bb92f32f567bd8c11e0 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com> Date: Wed, 30 May 2018 10:06:56 +0300 Subject: [PATCH 2/4] match formatting in 06-params.md and link back --- _episodes/13-expressions.md | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/_episodes/13-expressions.md b/_episodes/13-expressions.md index ecdaa3ca..aec7b461 100644 --- a/_episodes/13-expressions.md +++ b/_episodes/13-expressions.md @@ -86,30 +86,33 @@ Note that requirements must be provided as an array, with each entry (in this case, only `class: InlineJavascriptRequirement`) marked by a `-`. The same syntax is used to describe the additional command line arguments. -You can only use expressions in certain fields. These are: - -- [`arguments`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -- [`coresMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- [`coresMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- [`entry`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) -- [`entryname`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) -- `format` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) -- [`expression`](http://www.commonwl.org/v1.0/Workflow.html#ExpressionTool) -- [`envValue`](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef) -- [`glob`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) -- [`listing`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement) -- [`outdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- [`outdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- [`outputEval`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) -- `secondaryFiles` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) -- [`ramMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- [`ramMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- [`stdin`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -- [`stdout`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -- [`stderr`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -- [`tmpdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- [`tmpdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -- `valueFrom` (in a [CommandLineBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding), or [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput)) +> ## Where are parameter references allowed? +> Just like [parameter references]({{ page.root }}{% link _episodes/06-params.md %}), you can use JavaScript Expressions +> only in certain fields. These are: +> +> - [`arguments`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`coresMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`coresMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`entry`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) +> - [`entryname`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) +> - `format` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) +> - [`expression`](http://www.commonwl.org/v1.0/Workflow.html#ExpressionTool) +> - [`envValue`](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef) +> - [`glob`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) +> - [`listing`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement) +> - [`outdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`outdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`outputEval`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) +> - `secondaryFiles` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) +> - [`ramMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`ramMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`stdin`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`stdout`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`stderr`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - [`tmpdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - [`tmpdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - `valueFrom` (in a [CommandLineBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding), or [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput)) +{: .callout } [file-prop]: http://www.commonwl.org/v1.0/CommandLineTool.html#File From aab0f5e0e12fb5da5319391368bdc3aa87e6f7f8 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Wed, 30 May 2018 14:09:20 +0300 Subject: [PATCH 3/4] improve layout --- _episodes/06-params.md | 70 +++++++++++++++++++++++++------------ _episodes/13-expressions.md | 68 +++++++++++++++++++++++------------ 2 files changed, 93 insertions(+), 45 deletions(-) diff --git a/_episodes/06-params.md b/_episodes/06-params.md index f386c7ce..60c07415 100644 --- a/_episodes/06-params.md +++ b/_episodes/06-params.md @@ -83,27 +83,51 @@ reference the path to the tar file in the above example you would write > ## Where are parameter references allowed? > You can only use parameter references in certain fields. These are: -> -> - [`arguments`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`coresMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`coresMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`entry`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) -> - [`entryname`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) -> - `format` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) -> - [`expression`](http://www.commonwl.org/v1.0/Workflow.html#ExpressionTool) -> - [`envValue`](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef) -> - [`glob`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) -> - [`listing`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement) -> - [`outdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`outdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`outputEval`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) -> - `secondaryFiles` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) -> - [`ramMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`ramMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`stdin`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`stdout`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`stderr`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`tmpdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`tmpdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - `valueFrom` (in a [CommandLineBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding), or [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput)) +> +> - From [`CommandLineTool`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - `arguments` +> - `valueFrom` +> - `stdin` +> - `stdout` +> - `stderr` +> - From [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter) +> - `format` +> - `secondaryFiles` +> - From [`inputBinding`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding) +> - `valueFrom` +> - From [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter) +> - `format` +> - `secondaryFiles` +> - From [CommandOutputBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) +> - `glob` +> - `outputEval` +> - From `Workflow` +> - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter) +> - `format` +> - `secondaryFiles` +> - From `steps` +> - From [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput) +> - `valueFrom` +> - From ExpressionTool +> - `expression` +> - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter) +> - `format` +> - `secondaryFiles` +> - From [`ResourceRequirement`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - `coresMin` +> - `coresMax` +> - `ramMin` +> - `ramMax` +> - `tmpdirMin` +> - `tmpdirMax` +> - `outdirMin` +> - `outdirMax` +> - From [`InitialWorkDirRequirement`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement) +> - `listing` +> - in [Dirent](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) +> - `entry` +> - `entryname` +> - From `EnvVarRequirement` +> - From [EnvironmentDef](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef) +> - `envValue` {: .callout } diff --git a/_episodes/13-expressions.md b/_episodes/13-expressions.md index aec7b461..dc71f5a3 100644 --- a/_episodes/13-expressions.md +++ b/_episodes/13-expressions.md @@ -90,28 +90,52 @@ syntax is used to describe the additional command line arguments. > Just like [parameter references]({{ page.root }}{% link _episodes/06-params.md %}), you can use JavaScript Expressions > only in certain fields. These are: > -> - [`arguments`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`coresMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`coresMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`entry`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) -> - [`entryname`](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) -> - `format` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) -> - [`expression`](http://www.commonwl.org/v1.0/Workflow.html#ExpressionTool) -> - [`envValue`](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef) -> - [`glob`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) -> - [`listing`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement) -> - [`outdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`outdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`outputEval`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) -> - `secondaryFiles` (in a [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter), [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter), [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter), or [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)) -> - [`ramMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`ramMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`stdin`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`stdout`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`stderr`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) -> - [`tmpdirMin`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - [`tmpdirMax`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) -> - `valueFrom` (in a [CommandLineBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding), or [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput)) +> - From [`CommandLineTool`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool) +> - `arguments` +> - `valueFrom` +> - `stdin` +> - `stdout` +> - `stderr` +> - From [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter) +> - `format` +> - `secondaryFiles` +> - From [`inputBinding`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding) +> - `valueFrom` +> - From [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter) +> - `format` +> - `secondaryFiles` +> - From [CommandOutputBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding) +> - `glob` +> - `outputEval` +> - From `Workflow` +> - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter) +> - `format` +> - `secondaryFiles` +> - From `steps` +> - From [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput) +> - `valueFrom` +> - From ExpressionTool +> - `expression` +> - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter) +> - `format` +> - `secondaryFiles` +> - From [`ResourceRequirement`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement) +> - `coresMin` +> - `coresMax` +> - `ramMin` +> - `ramMax` +> - `tmpdirMin` +> - `tmpdirMax` +> - `outdirMin` +> - `outdirMax` +> - From [`InitialWorkDirRequirement`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement) +> - `listing` +> - in [Dirent](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent) +> - `entry` +> - `entryname` +> - From `EnvVarRequirement` +> - From [EnvironmentDef](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef) +> - `envValue` {: .callout } From 3434aedbe352069b3a76f27c26d20e96e70a55aa Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Wed, 30 May 2018 14:32:53 +0300 Subject: [PATCH 4/4] add missing link for ExpressionTool --- _episodes/06-params.md | 2 +- _episodes/13-expressions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_episodes/06-params.md b/_episodes/06-params.md index 60c07415..5324542e 100644 --- a/_episodes/06-params.md +++ b/_episodes/06-params.md @@ -108,7 +108,7 @@ reference the path to the tar file in the above example you would write > - From `steps` > - From [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput) > - `valueFrom` -> - From ExpressionTool +> - From [ExpressionTool](https://www.commonwl.org/v1.0/Workflow.html#ExpressionTool) > - `expression` > - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter) > - `format` diff --git a/_episodes/13-expressions.md b/_episodes/13-expressions.md index dc71f5a3..f70fa581 100644 --- a/_episodes/13-expressions.md +++ b/_episodes/13-expressions.md @@ -114,7 +114,7 @@ syntax is used to describe the additional command line arguments. > - From `steps` > - From [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput) > - `valueFrom` -> - From ExpressionTool +> - From [ExpressionTool](https://www.commonwl.org/v1.0/Workflow.html#ExpressionTool) > - `expression` > - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter) > - `format`