Skip to content

Commit ee05c86

Browse files
mr-cmr-c
authored
cwl v1.2, publish the JSON Schema (#233)
1 parent d14defd commit ee05c86

8 files changed

Lines changed: 35 additions & 28 deletions

‎site/cwlsite-draft3-job.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"brandlink": "../index.html",
1010
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
1111
"primtype": null,
12-
"extra": { "class": "File", "path": "empty" }
12+
"extra": []
1313
},
1414
{
1515
"source": {
@@ -26,7 +26,7 @@
2626
"brandlink": "index.html",
2727
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
2828
"primtype": "#CWLType",
29-
"extra": { "class": "File", "path": "empty" }
29+
"extra": []
3030
},
3131
{
3232
"source": {
@@ -50,7 +50,7 @@
5050
"brandlink": "index.html",
5151
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
5252
"primtype": "#CWLType",
53-
"extra": { "class": "File", "path": "empty" }
53+
"extra": []
5454
},
5555
{
5656
"source": {$import: draft3-metaschema.json},
@@ -65,6 +65,6 @@
6565
"brandlink": "index.html",
6666
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
6767
"primtype": null,
68-
"extra": { "class": "File", "path": "empty" }
68+
"extra": []
6969
}
7070
]

‎site/cwlsite-v1.0.0-job.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"brandlink": "../index.html",
1010
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
1111
"primtype": null,
12-
"extra": { "class": "File", "path": "empty" }
12+
"extra": []
1313
},
1414
{
1515
"source": {
@@ -26,7 +26,7 @@
2626
"brandlink": "index.html",
2727
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
2828
"primtype": "#CWLType",
29-
"extra": { "class": "File", "path": "empty" }
29+
"extra": []
3030
},
3131
{
3232
"source": {
@@ -50,7 +50,7 @@
5050
"brandlink": "index.html",
5151
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
5252
"primtype": "#CWLType",
53-
"extra": { "class": "File", "path": "empty" }
53+
"extra": []
5454
},
5555
{
5656
"source": {$import: v1.0.0-metaschema.json},
@@ -65,7 +65,7 @@
6565
"brandlink": "index.html",
6666
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
6767
"primtype": null,
68-
"extra": { "class": "File", "path": "empty" }
68+
"extra": []
6969
}
7070

7171
]

‎site/cwlsite-v1.1.0-job.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
renderlist: []
77
source: {class: File, path: ../v1.1/index.md}
88
target: v1.1/index.html
9-
extra: {class: File, path: empty}
9+
extra: []
1010
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
1111
-20px; margin-left: -20px''></img>'
1212
brandlink: index.html
@@ -19,8 +19,8 @@
1919
secondaryFiles: {$import: v1.1.0-deps.yaml}
2020
target: v1.1/CommandLineTool.html
2121
extra:
22-
class: File
23-
path: ../v1.1/cwl-runner.cwl
22+
- class: File
23+
path: ../v1.1/cwl-runner.cwl
2424
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
2525
-20px; margin-left: -20px''></img>'
2626
brandlink: index.html
@@ -37,7 +37,7 @@
3737
path: ../v1.1/CommonWorkflowLanguage.yml
3838
secondaryFiles: {$import: v1.1.0-deps.yaml}
3939
target: v1.1/Workflow.html
40-
extra: {class: File, path: empty}
40+
extra: []
4141
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
4242
-20px; margin-left: -20px''></img>'
4343
brandlink: index.html
@@ -48,4 +48,4 @@
4848
'https://w3id.org/cwl/salad#Documentation']
4949
source: {$import: v1.1.0-metaschema.yaml}
5050
target: v1.1/SchemaSalad.html
51-
extra: {class: File, path: empty}
51+
extra: []

‎site/cwlsite-v1.2-job.yaml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
renderlist: []
77
source: {class: File, path: ../v1.2/index.md}
88
target: v1.2/index.html
9-
extra: {class: File, path: empty}
9+
extra: []
1010
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
1111
-20px; margin-left: -20px''></img>'
1212
brandlink: index.html
@@ -19,8 +19,11 @@
1919
secondaryFiles: {$import: v1.2-deps.yaml}
2020
target: v1.2/CommandLineTool.html
2121
extra:
22-
class: File
23-
path: ../v1.2/cwl-runner.cwl
22+
- class: File
23+
path: ../v1.2/cwl-runner.cwl
24+
- class: File
25+
basename: cwl-json-schema.yaml
26+
path: ../v1.2/json-schema/cwl.yaml
2427
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
2528
-20px; margin-left: -20px''></img>'
2629
brandlink: index.html
@@ -37,7 +40,7 @@
3740
path: ../v1.2/CommonWorkflowLanguage.yml
3841
secondaryFiles: {$import: v1.2-deps.yaml}
3942
target: v1.2/Workflow.html
40-
extra: {class: File, path: empty}
43+
extra: []
4144
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
4245
-20px; margin-left: -20px''></img>'
4346
brandlink: index.html
@@ -48,4 +51,4 @@
4851
'https://w3id.org/cwl/salad#Documentation']
4952
source: {$import: v1.2-metaschema.yaml}
5053
target: v1.2/SchemaSalad.html
51-
extra: {class: File, path: empty}
54+
extra: []

‎site/cwlsite-v1.3-job.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
renderlist: []
77
source: {class: File, path: ../v1.3/index.md}
88
target: v1.3/index.html
9-
extra: {class: File, path: empty}
9+
extra: []
1010
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
1111
-20px; margin-left: -20px''></img>'
1212
brandlink: index.html
@@ -19,8 +19,8 @@
1919
secondaryFiles: {$import: v1.3-deps.yaml}
2020
target: v1.3/CommandLineTool.html
2121
extra:
22-
class: File
23-
path: ../v1.3/cwl-runner.cwl
22+
- class: File
23+
path: ../v1.3/cwl-runner.cwl
2424
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
2525
-20px; margin-left: -20px''></img>'
2626
brandlink: index.html
@@ -37,7 +37,7 @@
3737
path: ../v1.3/CommonWorkflowLanguage.yml
3838
secondaryFiles: {$import: v1.3-deps.yaml}
3939
target: v1.3/Workflow.html
40-
extra: {class: File, path: empty}
40+
extra: []
4141
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
4242
-20px; margin-left: -20px''></img>'
4343
brandlink: index.html
@@ -48,4 +48,4 @@
4848
'https://w3id.org/cwl/salad#Documentation']
4949
source: {$import: v1.3-metaschema.yaml}
5050
target: v1.3/SchemaSalad.html
51-
extra: {class: File, path: empty}
51+
extra: []

‎site/cwlsite.cwl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ inputs:
2525
brandlink: string
2626
brandimg: string
2727
primtype: string?
28-
extra: File
28+
extra: File[]
2929
schemas:
3030
type:
3131
type: array

‎site/makedoc.cwl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ inputs:
4141
primtype:
4242
type: string?
4343
inputBinding: {prefix: "--primtype"}
44-
extra: File
44+
extra: File[]
4545
baseCommand: schema-salad-doc
4646
stdout: $(inputs.target)
4747
outputs:
@@ -58,6 +58,6 @@ outputs:
5858
return "";
5959
}
6060
extra_out:
61-
type: File
61+
type: File[]
6262
outputBinding:
6363
outputEval: $(inputs.extra)

‎site/mergesecondary.cwl‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ inputs:
66
secondary:
77
type:
88
type: array
9-
items: [File, Directory]
9+
items:
10+
- File
11+
- type: array
12+
items: File
13+
- Directory
1014
dirs: string[]
1115
expression: |
1216
${
@@ -19,7 +23,7 @@ expression: |
1923
inputs.primary.secondaryFiles.push({
2024
class: "Directory",
2125
basename: inputs.dirs[i],
22-
listing: [k]
26+
listing: Array.isArray(k) ? k: [k]
2327
});
2428
} else {
2529
inputs.primary.secondaryFiles.push(k);

0 commit comments

Comments
 (0)