Skip to content

Commit 1bc5c08

Browse files
tetrontetron
committed
Add CWL 1.2 draft spec
1 parent c331418 commit 1bc5c08

6 files changed

+343
-1
lines changed

‎site/cwlsite-job.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ render:
1313
- {$import: cwlsite-draft3-job.json}
1414
- {$import: cwlsite-v1.0.0-job.json}
1515
- {$import: cwlsite-v1.1.0-job.yaml}
16+
- {$import: cwlsite-v1.2-job.yaml}
1617
schemas:
1718
- {$import: cwlsite-draft3-schemas.json}
1819
- {$import: cwlsite-v1.0.0-schemas.json}
1920
- {$import: cwlsite-v1.1.0-schemas.yaml}
21+
- {$import: cwlsite-v1.2-schemas.yaml}

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
2+
-20px; margin-left: -20px''></img>'
3+
brandlink: ../index.html
4+
primtype: null
5+
redirect: []
6+
renderlist: []
7+
source: {class: File, path: ../v1.2/index.md}
8+
target: v1.2/index.html
9+
extra: {class: File, path: empty}
10+
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
11+
-20px; margin-left: -20px''></img>'
12+
brandlink: index.html
13+
primtype: '#CWLType'
14+
redirect: []
15+
renderlist: ['https://w3id.org/cwl/cwl#CommandLineToolDoc', 'https://w3id.org/cwl/cwl#CommandLineTool']
16+
source:
17+
class: File
18+
path: ../v1.2/CommandLineTool-standalone.yml
19+
secondaryFiles: {$import: v1.2-deps.yaml}
20+
target: v1.2/CommandLineTool.html
21+
extra:
22+
class: File
23+
path: ../v1.2/cwl-runner.cwl
24+
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
25+
-20px; margin-left: -20px''></img>'
26+
brandlink: index.html
27+
primtype: '#CWLType'
28+
redirect: ['https://w3id.org/cwl/cwl#CommandLineTool=CommandLineTool.html#CommandLineTool',
29+
'https://w3id.org/cwl/cwl#DockerRequirement=CommandLineTool.html#DockerRequirement',
30+
'https://w3id.org/cwl/cwl#CreateFileRequirement=CommandLineTool.html#CreateFileRequirement',
31+
'https://w3id.org/cwl/cwl#EnvVarRequirement=CommandLineTool.html#EnvVarRequirement',
32+
'https://w3id.org/cwl/cwl#ShellCommandRequirement=CommandLineTool.html#ShellCommandRequirement',
33+
'https://w3id.org/cwl/cwl#ResourceRequirement=CommandLineTool.html#ResourceRequirement']
34+
renderlist: ['https://w3id.org/cwl/cwl#WorkflowDoc', 'https://w3id.org/cwl/cwl#Workflow']
35+
source:
36+
class: File
37+
path: ../v1.2/CommonWorkflowLanguage.yml
38+
secondaryFiles: {$import: v1.2-deps.yaml}
39+
target: v1.2/Workflow.html
40+
extra: {class: File, path: empty}
41+
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
42+
-20px; margin-left: -20px''></img>'
43+
brandlink: index.html
44+
primtype: null
45+
redirect: []
46+
renderlist: ['https://w3id.org/cwl/salad#Semantic_Annotations_for_Linked_Avro_Data',
47+
'https://w3id.org/cwl/salad#SaladRecordSchema', 'https://w3id.org/cwl/salad#SaladEnumSchema',
48+
'https://w3id.org/cwl/salad#Documentation']
49+
source: {$import: v1.2-metaschema.yaml}
50+
target: v1.2/SchemaSalad.html
51+
extra: {class: File, path: empty}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- context_target: v1.2/cwl-context.json
2+
rdfs_target: v1.2/cwl.ttl
3+
graph_target: v1.2/cwl.svg
4+
schema_in:
5+
class: File
6+
path: ../v1.2/CommonWorkflowLanguage.yml
7+
secondaryFiles: {$import: v1.2-deps.yaml}
8+
- context_target: v1.2/salad-context.json
9+
rdfs_target: v1.2/salad.ttl
10+
graph_target: v1.2/salad.svg
11+
schema_in: {$import: v1.2-metaschema.yaml}

‎site/v1.2-deps.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
- basename: Process.yml
2+
class: File
3+
location: ../v1.2/Process.yml
4+
secondaryFiles:
5+
- {basename: concepts.md, class: File, location: ../v1.2/concepts.md}
6+
- basename: salad
7+
class: Directory
8+
listing:
9+
- basename: schema_salad
10+
class: Directory
11+
listing:
12+
- basename: metaschema
13+
class: Directory
14+
listing:
15+
- {basename: metaschema_base.yml, class: File, location: ../v1.2/salad/schema_salad/metaschema/metaschema_base.yml}
16+
- basename: CommandLineTool.yml
17+
class: File
18+
location: ../v1.2/CommandLineTool.yml
19+
secondaryFiles:
20+
- {basename: contrib.md, class: File, location: ../v1.2/contrib.md}
21+
- {basename: concepts.md, class: File, location: ../v1.2/concepts.md}
22+
- {basename: invocation.md, class: File, location: ../v1.2/invocation.md}
23+
- {basename: intro.md, class: File, location: ../v1.2/intro.md}
24+
- basename: Workflow.yml
25+
class: File
26+
location: ../v1.2/Workflow.yml
27+
secondaryFiles:
28+
- {basename: contrib.md, class: File, location: ../v1.2/contrib.md}
29+
- {basename: concepts.md, class: File, location: ../v1.2/concepts.md}
30+
- {basename: intro.md, class: File, location: ../v1.2/intro.md}

‎site/v1.2-metaschema.yaml

Lines changed: 246 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,246 @@
1+
{
2+
"class": "File",
3+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
4+
"location": "../v1.2/salad/schema_salad/metaschema/metaschema.yml",
5+
"secondaryFiles": [
6+
{
7+
"nameext": ".md",
8+
"basename": "import_include.md",
9+
"class": "File",
10+
"location": "../v1.2/salad/schema_salad/metaschema/import_include.md",
11+
"nameroot": "import_include"
12+
},
13+
{
14+
"nameext": ".yml",
15+
"class": "File",
16+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
17+
"location": "../v1.2/salad/schema_salad/metaschema/link_res.yml",
18+
"basename": "link_res.yml",
19+
"secondaryFiles": [
20+
{
21+
"nameext": ".yml",
22+
"basename": "link_res_proc.yml",
23+
"class": "File",
24+
"location": "../v1.2/salad/schema_salad/metaschema/link_res_proc.yml",
25+
"nameroot": "link_res_proc"
26+
},
27+
{
28+
"nameext": ".yml",
29+
"basename": "link_res_src.yml",
30+
"class": "File",
31+
"location": "../v1.2/salad/schema_salad/metaschema/link_res_src.yml",
32+
"nameroot": "link_res_src"
33+
},
34+
{
35+
"nameext": ".yml",
36+
"basename": "link_res_schema.yml",
37+
"class": "File",
38+
"location": "../v1.2/salad/schema_salad/metaschema/link_res_schema.yml",
39+
"nameroot": "link_res_schema"
40+
}
41+
],
42+
"nameroot": "link_res"
43+
},
44+
{
45+
"nameext": ".yml",
46+
"class": "File",
47+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
48+
"location": "../v1.2/salad/schema_salad/metaschema/ident_res.yml",
49+
"basename": "ident_res.yml",
50+
"secondaryFiles": [
51+
{
52+
"nameext": ".yml",
53+
"basename": "ident_res_schema.yml",
54+
"class": "File",
55+
"location": "../v1.2/salad/schema_salad/metaschema/ident_res_schema.yml",
56+
"nameroot": "ident_res_schema"
57+
},
58+
{
59+
"nameext": ".yml",
60+
"basename": "ident_res_src.yml",
61+
"class": "File",
62+
"location": "../v1.2/salad/schema_salad/metaschema/ident_res_src.yml",
63+
"nameroot": "ident_res_src"
64+
},
65+
{
66+
"nameext": ".yml",
67+
"basename": "ident_res_proc.yml",
68+
"class": "File",
69+
"location": "../v1.2/salad/schema_salad/metaschema/ident_res_proc.yml",
70+
"nameroot": "ident_res_proc"
71+
}
72+
],
73+
"nameroot": "ident_res"
74+
},
75+
{
76+
"nameext": ".yml",
77+
"class": "File",
78+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
79+
"location": "../v1.2/salad/schema_salad/metaschema/field_name.yml",
80+
"basename": "field_name.yml",
81+
"secondaryFiles": [
82+
{
83+
"nameext": ".yml",
84+
"basename": "field_name_proc.yml",
85+
"class": "File",
86+
"location": "../v1.2/salad/schema_salad/metaschema/field_name_proc.yml",
87+
"nameroot": "field_name_proc"
88+
},
89+
{
90+
"nameext": ".yml",
91+
"basename": "field_name_schema.yml",
92+
"class": "File",
93+
"location": "../v1.2/salad/schema_salad/metaschema/field_name_schema.yml",
94+
"nameroot": "field_name_schema"
95+
},
96+
{
97+
"nameext": ".yml",
98+
"basename": "field_name_src.yml",
99+
"class": "File",
100+
"location": "../v1.2/salad/schema_salad/metaschema/field_name_src.yml",
101+
"nameroot": "field_name_src"
102+
}
103+
],
104+
"nameroot": "field_name"
105+
},
106+
{
107+
"nameext": ".yml",
108+
"class": "File",
109+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
110+
"location": "../v1.2/salad/schema_salad/metaschema/sfdsl_res.yml",
111+
"basename": "sfdsl_res.yml",
112+
"secondaryFiles": [
113+
{
114+
"nameext": ".yml",
115+
"basename": "sfdsl_res_src.yml",
116+
"class": "File",
117+
"location": "../v1.2/salad/schema_salad/metaschema/sfdsl_res_src.yml",
118+
"nameroot": "sfdsl_res_src"
119+
},
120+
{
121+
"nameext": ".yml",
122+
"basename": "sfdsl_res_schema.yml",
123+
"class": "File",
124+
"location": "../v1.2/salad/schema_salad/metaschema/sfdsl_res_schema.yml",
125+
"nameroot": "sfdsl_res_schema"
126+
},
127+
{
128+
"nameext": ".yml",
129+
"basename": "sfdsl_res_proc.yml",
130+
"class": "File",
131+
"location": "../v1.2/salad/schema_salad/metaschema/sfdsl_res_proc.yml",
132+
"nameroot": "sfdsl_res_proc"
133+
}
134+
],
135+
"nameroot": "sfdsl_res"
136+
},
137+
{
138+
"nameext": ".yml",
139+
"class": "File",
140+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
141+
"location": "../v1.2/salad/schema_salad/metaschema/typedsl_res.yml",
142+
"basename": "typedsl_res.yml",
143+
"secondaryFiles": [
144+
{
145+
"nameext": ".yml",
146+
"basename": "typedsl_res_schema.yml",
147+
"class": "File",
148+
"location": "../v1.2/salad/schema_salad/metaschema/typedsl_res_schema.yml",
149+
"nameroot": "typedsl_res_schema"
150+
},
151+
{
152+
"nameext": ".yml",
153+
"basename": "typedsl_res_src.yml",
154+
"class": "File",
155+
"location": "../v1.2/salad/schema_salad/metaschema/typedsl_res_src.yml",
156+
"nameroot": "typedsl_res_src"
157+
},
158+
{
159+
"nameext": ".yml",
160+
"basename": "typedsl_res_proc.yml",
161+
"class": "File",
162+
"location": "../v1.2/salad/schema_salad/metaschema/typedsl_res_proc.yml",
163+
"nameroot": "typedsl_res_proc"
164+
}
165+
],
166+
"nameroot": "typedsl_res"
167+
},
168+
{
169+
"nameext": ".yml",
170+
"class": "File",
171+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
172+
"location": "../v1.2/salad/schema_salad/metaschema/map_res.yml",
173+
"basename": "map_res.yml",
174+
"secondaryFiles": [
175+
{
176+
"nameext": ".yml",
177+
"basename": "map_res_src.yml",
178+
"class": "File",
179+
"location": "../v1.2/salad/schema_salad/metaschema/map_res_src.yml",
180+
"nameroot": "map_res_src"
181+
},
182+
{
183+
"nameext": ".yml",
184+
"basename": "map_res_schema.yml",
185+
"class": "File",
186+
"location": "../v1.2/salad/schema_salad/metaschema/map_res_schema.yml",
187+
"nameroot": "map_res_schema"
188+
},
189+
{
190+
"nameext": ".yml",
191+
"basename": "map_res_proc.yml",
192+
"class": "File",
193+
"location": "../v1.2/salad/schema_salad/metaschema/map_res_proc.yml",
194+
"nameroot": "map_res_proc"
195+
}
196+
],
197+
"nameroot": "map_res"
198+
},
199+
{
200+
"nameext": ".md",
201+
"basename": "salad.md",
202+
"class": "File",
203+
"location": "../v1.2/salad/schema_salad/metaschema/salad.md",
204+
"nameroot": "salad"
205+
},
206+
{
207+
"nameext": ".yml",
208+
"class": "File",
209+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
210+
"location": "../v1.2/salad/schema_salad/metaschema/vocab_res.yml",
211+
"basename": "vocab_res.yml",
212+
"secondaryFiles": [
213+
{
214+
"nameext": ".yml",
215+
"basename": "vocab_res_proc.yml",
216+
"class": "File",
217+
"location": "../v1.2/salad/schema_salad/metaschema/vocab_res_proc.yml",
218+
"nameroot": "vocab_res_proc"
219+
},
220+
{
221+
"nameext": ".yml",
222+
"basename": "vocab_res_src.yml",
223+
"class": "File",
224+
"location": "../v1.2/salad/schema_salad/metaschema/vocab_res_src.yml",
225+
"nameroot": "vocab_res_src"
226+
},
227+
{
228+
"nameext": ".yml",
229+
"basename": "vocab_res_schema.yml",
230+
"class": "File",
231+
"location": "../v1.2/salad/schema_salad/metaschema/vocab_res_schema.yml",
232+
"nameroot": "vocab_res_schema"
233+
}
234+
],
235+
"nameroot": "vocab_res"
236+
},
237+
{
238+
"nameext": ".yml",
239+
"class": "File",
240+
"format": "https://www.iana.org/assignments/media-types/application/cwl",
241+
"location": "../v1.2/salad/schema_salad/metaschema/metaschema_base.yml",
242+
"basename": "metaschema_base.yml",
243+
"nameroot": "metaschema_base"
244+
}
245+
]
246+
}

‎website.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
set -e
44
set -x
55

6-
rm -Rf draft-3 v1.0 v1.1.0-dev1 v1.1.0 v1.1 temp
6+
rm -Rf draft-3 v1.0 v1.1.0-dev1 v1.1.0 v1.1 v1.2 temp
77

88
git clone https://github.com/common-workflow-language/common-workflow-language.git \
99
temp
1010
mv temp/v1.0 ./
1111
mv temp/draft-3 ./
1212
git clone https://github.com/common-workflow-language/cwl-v1.1.git \
1313
v1.1
14+
git clone https://github.com/common-workflow-language/cwl-v1.2.git \
15+
v1.2
1416

1517
cwltool $@ --cache cache --outdir common-workflow-language.github.io site/cwlsite.cwl site/cwlsite-job.yaml

0 commit comments

Comments
 (0)