Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions site/cwlsite-draft3-job.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"brandlink": "../index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": null,
"extra": { "class": "File", "path": "empty" }
"extra": []
},
{
"source": {
Expand All @@ -26,7 +26,7 @@
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": "#CWLType",
"extra": { "class": "File", "path": "empty" }
"extra": []
},
{
"source": {
Expand All @@ -50,7 +50,7 @@
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": "#CWLType",
"extra": { "class": "File", "path": "empty" }
"extra": []
},
{
"source": {$import: draft3-metaschema.json},
Expand All @@ -65,6 +65,6 @@
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": null,
"extra": { "class": "File", "path": "empty" }
"extra": []
}
]
8 changes: 4 additions & 4 deletions site/cwlsite-v1.0.0-job.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"brandlink": "../index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": null,
"extra": { "class": "File", "path": "empty" }
"extra": []
},
{
"source": {
Expand All @@ -26,7 +26,7 @@
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": "#CWLType",
"extra": { "class": "File", "path": "empty" }
"extra": []
},
{
"source": {
Expand All @@ -50,7 +50,7 @@
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": "#CWLType",
"extra": { "class": "File", "path": "empty" }
"extra": []
},
{
"source": {$import: v1.0.0-metaschema.json},
Expand All @@ -65,7 +65,7 @@
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": null,
"extra": { "class": "File", "path": "empty" }
"extra": []
}

]
10 changes: 5 additions & 5 deletions site/cwlsite-v1.1.0-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
renderlist: []
source: {class: File, path: ../v1.1/index.md}
target: v1.1/index.html
extra: {class: File, path: empty}
extra: []
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -19,8 +19,8 @@
secondaryFiles: {$import: v1.1.0-deps.yaml}
target: v1.1/CommandLineTool.html
extra:
class: File
path: ../v1.1/cwl-runner.cwl
- class: File
path: ../v1.1/cwl-runner.cwl
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -37,7 +37,7 @@
path: ../v1.1/CommonWorkflowLanguage.yml
secondaryFiles: {$import: v1.1.0-deps.yaml}
target: v1.1/Workflow.html
extra: {class: File, path: empty}
extra: []
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -48,4 +48,4 @@
'https://w3id.org/cwl/salad#Documentation']
source: {$import: v1.1.0-metaschema.yaml}
target: v1.1/SchemaSalad.html
extra: {class: File, path: empty}
extra: []
13 changes: 8 additions & 5 deletions site/cwlsite-v1.2-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
renderlist: []
source: {class: File, path: ../v1.2/index.md}
target: v1.2/index.html
extra: {class: File, path: empty}
extra: []
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -19,8 +19,11 @@
secondaryFiles: {$import: v1.2-deps.yaml}
target: v1.2/CommandLineTool.html
extra:
class: File
path: ../v1.2/cwl-runner.cwl
- class: File
path: ../v1.2/cwl-runner.cwl
- class: File
basename: cwl-json-schema.yaml
path: ../v1.2/json-schema/cwl.yaml
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -37,7 +40,7 @@
path: ../v1.2/CommonWorkflowLanguage.yml
secondaryFiles: {$import: v1.2-deps.yaml}
target: v1.2/Workflow.html
extra: {class: File, path: empty}
extra: []
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -48,4 +51,4 @@
'https://w3id.org/cwl/salad#Documentation']
source: {$import: v1.2-metaschema.yaml}
target: v1.2/SchemaSalad.html
extra: {class: File, path: empty}
extra: []
10 changes: 5 additions & 5 deletions site/cwlsite-v1.3-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
renderlist: []
source: {class: File, path: ../v1.3/index.md}
target: v1.3/index.html
extra: {class: File, path: empty}
extra: []
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -19,8 +19,8 @@
secondaryFiles: {$import: v1.3-deps.yaml}
target: v1.3/CommandLineTool.html
extra:
class: File
path: ../v1.3/cwl-runner.cwl
- class: File
path: ../v1.3/cwl-runner.cwl
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -37,7 +37,7 @@
path: ../v1.3/CommonWorkflowLanguage.yml
secondaryFiles: {$import: v1.3-deps.yaml}
target: v1.3/Workflow.html
extra: {class: File, path: empty}
extra: []
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand All @@ -48,4 +48,4 @@
'https://w3id.org/cwl/salad#Documentation']
source: {$import: v1.3-metaschema.yaml}
target: v1.3/SchemaSalad.html
extra: {class: File, path: empty}
extra: []
2 changes: 1 addition & 1 deletion site/cwlsite.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ inputs:
brandlink: string
brandimg: string
primtype: string?
extra: File
extra: File[]
schemas:
type:
type: array
Expand Down
4 changes: 2 additions & 2 deletions site/makedoc.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ inputs:
primtype:
type: string?
inputBinding: {prefix: "--primtype"}
extra: File
extra: File[]
baseCommand: schema-salad-doc
stdout: $(inputs.target)
outputs:
Expand All @@ -58,6 +58,6 @@ outputs:
return "";
}
extra_out:
type: File
type: File[]
outputBinding:
outputEval: $(inputs.extra)
8 changes: 6 additions & 2 deletions site/mergesecondary.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ inputs:
secondary:
type:
type: array
items: [File, Directory]
items:
- File
- type: array
items: File
- Directory
dirs: string[]
expression: |
${
Expand All @@ -19,7 +23,7 @@ expression: |
inputs.primary.secondaryFiles.push({
class: "Directory",
basename: inputs.dirs[i],
listing: [k]
listing: Array.isArray(k) ? k: [k]
});
} else {
inputs.primary.secondaryFiles.push(k);
Expand Down