Skip to content

Commit

Permalink
render CWL v1.3.0-dev1 draft (#205)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mr-c
mr-c committed May 17, 2024
1 parent dbb7203 commit f8bffb9
Show file tree
Hide file tree
Showing 6 changed files with 354 additions and 10 deletions.
2 changes: 2 additions & 0 deletions site/cwlsite-job.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ render:
- {$import: cwlsite-v1.0.0-job.json}
- {$import: cwlsite-v1.1.0-job.yaml}
- {$import: cwlsite-v1.2-job.yaml}
- {$import: cwlsite-v1.3-job.yaml}
schemas:
- {$import: cwlsite-draft3-schemas.json}
- {$import: cwlsite-v1.0.0-schemas.json}
- {$import: cwlsite-v1.1.0-schemas.yaml}
- {$import: cwlsite-v1.2-schemas.yaml}
- {$import: cwlsite-v1.3-schemas.yaml}
51 changes: 51 additions & 0 deletions site/cwlsite-v1.3-job.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: ../index.html
primtype: null
redirect: []
renderlist: []
source: {class: File, path: ../v1.3/index.md}
target: v1.3/index.html
extra: {class: File, path: empty}
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
primtype: '#CWLType'
redirect: []
renderlist: ['https://w3id.org/cwl/cwl#CommandLineToolDoc', 'https://w3id.org/cwl/cwl#CommandLineTool']
source:
class: File
path: ../v1.3/CommandLineTool-standalone.yml
secondaryFiles: {$import: v1.3-deps.yaml}
target: v1.3/CommandLineTool.html
extra:
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
primtype: '#CWLType'
redirect: ['https://w3id.org/cwl/cwl#CommandLineTool=CommandLineTool.html#CommandLineTool',
'https://w3id.org/cwl/cwl#DockerRequirement=CommandLineTool.html#DockerRequirement',
'https://w3id.org/cwl/cwl#CreateFileRequirement=CommandLineTool.html#CreateFileRequirement',
'https://w3id.org/cwl/cwl#EnvVarRequirement=CommandLineTool.html#EnvVarRequirement',
'https://w3id.org/cwl/cwl#ShellCommandRequirement=CommandLineTool.html#ShellCommandRequirement',
'https://w3id.org/cwl/cwl#ResourceRequirement=CommandLineTool.html#ResourceRequirement']
renderlist: ['https://w3id.org/cwl/cwl#WorkflowDoc', 'https://w3id.org/cwl/cwl#Workflow']
source:
class: File
path: ../v1.3/CommonWorkflowLanguage.yml
secondaryFiles: {$import: v1.3-deps.yaml}
target: v1.3/Workflow.html
extra: {class: File, path: empty}
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
primtype: null
redirect: []
renderlist: ['https://w3id.org/cwl/salad#Semantic_Annotations_for_Linked_Avro_Data',
'https://w3id.org/cwl/salad#SaladRecordSchema', 'https://w3id.org/cwl/salad#SaladEnumSchema',
'https://w3id.org/cwl/salad#Documentation']
source: {$import: v1.3-metaschema.yaml}
target: v1.3/SchemaSalad.html
extra: {class: File, path: empty}
11 changes: 11 additions & 0 deletions site/cwlsite-v1.3-schemas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- context_target: v1.3/cwl-context.json
rdfs_target: v1.3/cwl.ttl
graph_target: v1.3/cwl.svg
schema_in:
class: File
path: ../v1.3/CommonWorkflowLanguage.yml
secondaryFiles: {$import: v1.3-deps.yaml}
- context_target: v1.3/salad-context.json
rdfs_target: v1.3/salad.ttl
graph_target: v1.3/salad.svg
schema_in: {$import: v1.3-metaschema.yaml}
40 changes: 40 additions & 0 deletions site/v1.3-deps.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
- basename: Process.yml
class: File
location: ../v1.3/Process.yml
secondaryFiles:
- {basename: concepts.md, class: File, location: ../v1.3/concepts.md}
- basename: salad
class: Directory
listing:
- basename: schema_salad
class: Directory
listing:
- basename: metaschema
class: Directory
listing:
- {basename: metaschema_base.yml, class: File, location: ../v1.3/salad/schema_salad/metaschema/metaschema_base.yml}
- basename: CommandLineTool.yml
class: File
location: ../v1.3/CommandLineTool.yml
secondaryFiles:
- {basename: contrib.md, class: File, location: ../v1.3/contrib.md}
- {basename: concepts.md, class: File, location: ../v1.3/concepts.md}
- {basename: invocation.md, class: File, location: ../v1.3/invocation.md}
- {basename: intro.md, class: File, location: ../v1.3/intro.md}
- {basename: Base.yml, class: File, location: ../v1.3/Base.yml}
- basename: Workflow.yml
class: File
location: ../v1.3/Workflow.yml
secondaryFiles:
- {basename: contrib.md, class: File, location: ../v1.3/contrib.md}
- {basename: concepts.md, class: File, location: ../v1.3/concepts.md}
- {basename: intro.md, class: File, location: ../v1.3/intro.md}
- {basename: Base.yml, class: File, location: ../v1.3/Base.yml}
- basename: Operation.yml
class: File
location: ../v1.3/Operation.yml
secondaryFiles:
- {basename: contrib.md, class: File, location: ../v1.3/contrib.md}
- basename: Base.yml
class: File
location: ../v1.3/Base.yml
246 changes: 246 additions & 0 deletions site/v1.3-metaschema.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
{
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/metaschema.yml",
"secondaryFiles": [
{
"nameext": ".md",
"basename": "import_include.md",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/import_include.md",
"nameroot": "import_include"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/link_res.yml",
"basename": "link_res.yml",
"secondaryFiles": [
{
"nameext": ".yml",
"basename": "link_res_proc.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/link_res_proc.yml",
"nameroot": "link_res_proc"
},
{
"nameext": ".yml",
"basename": "link_res_src.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/link_res_src.yml",
"nameroot": "link_res_src"
},
{
"nameext": ".yml",
"basename": "link_res_schema.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/link_res_schema.yml",
"nameroot": "link_res_schema"
}
],
"nameroot": "link_res"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/ident_res.yml",
"basename": "ident_res.yml",
"secondaryFiles": [
{
"nameext": ".yml",
"basename": "ident_res_schema.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/ident_res_schema.yml",
"nameroot": "ident_res_schema"
},
{
"nameext": ".yml",
"basename": "ident_res_src.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/ident_res_src.yml",
"nameroot": "ident_res_src"
},
{
"nameext": ".yml",
"basename": "ident_res_proc.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/ident_res_proc.yml",
"nameroot": "ident_res_proc"
}
],
"nameroot": "ident_res"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/field_name.yml",
"basename": "field_name.yml",
"secondaryFiles": [
{
"nameext": ".yml",
"basename": "field_name_proc.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/field_name_proc.yml",
"nameroot": "field_name_proc"
},
{
"nameext": ".yml",
"basename": "field_name_schema.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/field_name_schema.yml",
"nameroot": "field_name_schema"
},
{
"nameext": ".yml",
"basename": "field_name_src.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/field_name_src.yml",
"nameroot": "field_name_src"
}
],
"nameroot": "field_name"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/sfdsl_res.yml",
"basename": "sfdsl_res.yml",
"secondaryFiles": [
{
"nameext": ".yml",
"basename": "sfdsl_res_src.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/sfdsl_res_src.yml",
"nameroot": "sfdsl_res_src"
},
{
"nameext": ".yml",
"basename": "sfdsl_res_schema.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/sfdsl_res_schema.yml",
"nameroot": "sfdsl_res_schema"
},
{
"nameext": ".yml",
"basename": "sfdsl_res_proc.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/sfdsl_res_proc.yml",
"nameroot": "sfdsl_res_proc"
}
],
"nameroot": "sfdsl_res"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/typedsl_res.yml",
"basename": "typedsl_res.yml",
"secondaryFiles": [
{
"nameext": ".yml",
"basename": "typedsl_res_schema.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/typedsl_res_schema.yml",
"nameroot": "typedsl_res_schema"
},
{
"nameext": ".yml",
"basename": "typedsl_res_src.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/typedsl_res_src.yml",
"nameroot": "typedsl_res_src"
},
{
"nameext": ".yml",
"basename": "typedsl_res_proc.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/typedsl_res_proc.yml",
"nameroot": "typedsl_res_proc"
}
],
"nameroot": "typedsl_res"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/map_res.yml",
"basename": "map_res.yml",
"secondaryFiles": [
{
"nameext": ".yml",
"basename": "map_res_src.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/map_res_src.yml",
"nameroot": "map_res_src"
},
{
"nameext": ".yml",
"basename": "map_res_schema.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/map_res_schema.yml",
"nameroot": "map_res_schema"
},
{
"nameext": ".yml",
"basename": "map_res_proc.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/map_res_proc.yml",
"nameroot": "map_res_proc"
}
],
"nameroot": "map_res"
},
{
"nameext": ".md",
"basename": "salad.md",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/salad.md",
"nameroot": "salad"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/vocab_res.yml",
"basename": "vocab_res.yml",
"secondaryFiles": [
{
"nameext": ".yml",
"basename": "vocab_res_proc.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/vocab_res_proc.yml",
"nameroot": "vocab_res_proc"
},
{
"nameext": ".yml",
"basename": "vocab_res_src.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/vocab_res_src.yml",
"nameroot": "vocab_res_src"
},
{
"nameext": ".yml",
"basename": "vocab_res_schema.yml",
"class": "File",
"location": "../v1.3/salad/schema_salad/metaschema/vocab_res_schema.yml",
"nameroot": "vocab_res_schema"
}
],
"nameroot": "vocab_res"
},
{
"nameext": ".yml",
"class": "File",
"format": "https://www.iana.org/assignments/media-types/application/cwl",
"location": "../v1.3/salad/schema_salad/metaschema/metaschema_base.yml",
"basename": "metaschema_base.yml",
"nameroot": "metaschema_base"
}
]
}
14 changes: 4 additions & 10 deletions website.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ set -x

for repo in https://github.com/common-workflow-language/common-workflow-language \
https://github.com/common-workflow-language/cwl-v1.1 \
https://github.com/common-workflow-language/cwl-v1.2 \
https://github.com/common-workflow-language/cwl-v1.3 \
https://github.com/common-workflow-lab/cwl-novice-tutorial ; do
bn=$(basename $repo)
if [[ -d $bn ]] ; then
Expand All @@ -14,20 +16,12 @@ for repo in https://github.com/common-workflow-language/common-workflow-language
fi
done

repo=https://github.com/common-workflow-language/cwl-v1.2 \
bn=$(basename $repo)
if [[ -d $bn ]] ; then
(cd $bn && git fetch origin && git reset --hard origin/main)
else
git clone $repo && pushd $bn; git checkout main ; git show --no-patch ; popd
fi


rm -rf draft-3 v1.0 v1.1 v1.2
rm -rf draft-3 v1.0 v1.1 v1.2 v1.3
ln -s common-workflow-language/draft-3 draft-3
ln -s common-workflow-language/v1.0 v1.0
ln -s cwl-v1.1 v1.1
ln -s cwl-v1.2 v1.2
ln -s cwl-v1.3 v1.3

if [[ -z "$WORKSPACE" ]] ; then
WORKSPACE=$PWD
Expand Down

0 comments on commit f8bffb9

Please sign in to comment.