Skip to content

Commit 758b053

Browse files
mr-cmr-c
committed
put the Salad schemas on the website
1 parent 388ef7a commit 758b053

9 files changed

Lines changed: 89 additions & 57 deletions

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

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,44 @@
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": []
12+
"extra": [
13+
{
14+
"class": "File",
15+
"path": "../v1.0/CommonWorkflowLanguage.yml"
16+
},
17+
{
18+
"class": "File",
19+
"path": "../v1.0/Process.yml"
20+
},
21+
{
22+
"class": "File",
23+
"path": "../v1.0/CommandLineTool.yml"
24+
},
25+
{
26+
"class": "File",
27+
"path": "../v1.0/Workflow.yml"
28+
},
29+
{
30+
"class": "File",
31+
"path": "../v1.0/metaschema_base.yml"
32+
},
33+
{
34+
"class": "File",
35+
"path": "../v1.0/concepts.md"
36+
},
37+
{
38+
"class": "File",
39+
"path": "../v1.0/invocation.md"
40+
},
41+
{
42+
"class": "File",
43+
"path": "../v1.0/intro.md"
44+
},
45+
{
46+
"class": "File",
47+
"path": "../v1.0/contrib.md"
48+
}
49+
]
1350
},
1451
{
1552
"source": {

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
renderlist: []
77
source: {class: File, path: ../v1.1/index.md}
88
target: v1.1/index.html
9-
extra: []
9+
extra: [
10+
{class: File, path: ../v1.1/CommonWorkflowLanguage.yml},
11+
{class: File, path: ../v1.1/Process.yml},
12+
{class: File, path: ../v1.1/CommandLineTool.yml},
13+
{class: File, path: ../v1.1/Workflow.yml},
14+
{class: File, path: ../v1.1/metaschema_base.yml},
15+
{class: File, path: ../v1.1/concepts.md},
16+
{class: File, path: ../v1.1/invocation.md},
17+
{class: File, path: ../v1.1/intro.md},
18+
{class: File, path: ../v1.1/contrib.md},
19+
]
1020
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
1121
-20px; margin-left: -20px''></img>'
1222
brandlink: index.html

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@
66
renderlist: []
77
source: {class: File, path: ../v1.2/index.md}
88
target: v1.2/index.html
9-
extra: []
9+
extra: [
10+
{class: File, path: ../v1.2/CommonWorkflowLanguage.yml},
11+
{class: File, path: ../v1.2/Process.yml},
12+
{class: File, path: ../v1.2/Operation.yml},
13+
{class: File, path: ../v1.2/CommandLineTool.yml},
14+
{class: File, path: ../v1.2/Workflow.yml},
15+
{class: File, path: ../v1.2/metaschema_base.yml},
16+
{class: File, path: ../v1.2/concepts.md},
17+
{class: File, path: ../v1.2/invocation.md},
18+
{class: File, path: ../v1.2/intro.md},
19+
{class: File, path: ../v1.2/contrib.md},
20+
]
1021
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
1122
-20px; margin-left: -20px''></img>'
1223
brandlink: index.html

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@
66
renderlist: []
77
source: {class: File, path: ../v1.3/index.md}
88
target: v1.3/index.html
9-
extra: []
9+
extra: [
10+
{class: File, path: ../v1.3/CommonWorkflowLanguage.yml},
11+
{class: File, path: ../v1.3/Base.yml},
12+
{class: File, path: ../v1.3/Process.yml},
13+
{class: File, path: ../v1.3/Operation.yml},
14+
{class: File, path: ../v1.3/CommandLineTool.yml},
15+
{class: File, path: ../v1.3/Workflow.yml},
16+
{class: File, path: ../v1.3/metaschema_base.yml},
17+
{class: File, path: ../v1.3/concepts.md},
18+
{class: File, path: ../v1.3/invocation.md},
19+
{class: File, path: ../v1.3/intro.md},
20+
{class: File, path: ../v1.3/contrib.md},
21+
]
1022
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
1123
-20px; margin-left: -20px''></img>'
1224
brandlink: index.html

‎site/v1.0.0-deps.json‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,9 @@
88
"location": "../v1.0/concepts.md"
99
},
1010
{
11-
"basename": "salad",
12-
"class": "Directory",
13-
"listing": [
14-
{
15-
"basename": "schema_salad",
16-
"class": "Directory",
17-
"listing": [
18-
{
19-
"basename": "metaschema",
20-
"class": "Directory",
21-
"listing": [
22-
{
23-
"basename": "metaschema_base.yml",
24-
"class": "File",
25-
"location": "../v1.0/salad/schema_salad/metaschema/metaschema_base.yml"
26-
}
27-
]
28-
}
29-
]
30-
}
31-
]
11+
"basename": "metaschema_base.yml",
12+
"class": "File",
13+
"location": "../v1.0/metaschema_base.yml"
3214
}
3315
],
3416
"basename": "Process.yml",

‎site/v1.1.0-deps.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,7 @@
33
location: ../v1.1/Process.yml
44
secondaryFiles:
55
- {basename: concepts.md, class: File, location: ../v1.1/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.1/salad/schema_salad/metaschema/metaschema_base.yml}
6+
- {basename: metaschema_base.yml, class: File, location: ../v1.1/metaschema_base.yml}
167
- basename: CommandLineTool.yml
178
class: File
189
location: ../v1.1/CommandLineTool.yml

‎site/v1.2-deps.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,7 @@
33
location: ../v1.2/Process.yml
44
secondaryFiles:
55
- {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}
6+
- {basename: metaschema_base.yml, class: File, location: ../v1.2/metaschema_base.yml}
167
- basename: CommandLineTool.yml
178
class: File
189
location: ../v1.2/CommandLineTool.yml

‎site/v1.3-deps.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,7 @@
33
location: ../v1.3/Process.yml
44
secondaryFiles:
55
- {basename: concepts.md, class: File, location: ../v1.3/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.3/salad/schema_salad/metaschema/metaschema_base.yml}
6+
- {basename: metaschema_base.yml, class: File, location: ../v1.3/metaschema_base.yml}
167
- basename: CommandLineTool.yml
178
class: File
189
location: ../v1.3/CommandLineTool.yml

‎website.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ for repo in https://github.com/common-workflow-language/common-workflow-language
1010
https://github.com/common-workflow-lab/cwl-novice-tutorial ; do
1111
bn=$(basename $repo)
1212
if [[ -d $bn ]] ; then
13-
(cd $bn && git fetch origin && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD))
13+
(cd "$bn" && git fetch origin && git reset --hard "origin/$(git rev-parse --abbrev-ref HEAD)")
1414
else
1515
git clone $repo
1616
fi
@@ -23,10 +23,17 @@ ln -s cwl-v1.1 v1.1
2323
ln -s cwl-v1.2 v1.2
2424
ln -s cwl-v1.3 v1.3
2525

26+
for ver in v1.0 v1.1 v1.2 v1.3 ; do
27+
cd "${ver}" && \
28+
git grep -l /metaschema_base | xargs sed -i 's=salad/schema_salad/metaschema/metaschema_base.yml=metaschema_base.yml=g' && \
29+
cp salad/schema_salad/metaschema/metaschema_base.yml metaschema_base.yml
30+
cd -
31+
done
32+
2633
if [[ -z "$WORKSPACE" ]] ; then
2734
WORKSPACE=$PWD
2835
fi
2936

3037
mkdir -p common-workflow-language.github.io
3138
cd common-workflow-language.github.io
32-
cwltool $@ --cache $WORKSPACE/cache --relax-path-checks $WORKSPACE/site/cwlsite.cwl $WORKSPACE/site/cwlsite-job.yaml
39+
cwltool "$@" --cache "$WORKSPACE/cache" --relax-path-checks "$WORKSPACE/site/cwlsite.cwl" "$WORKSPACE/site/cwlsite-job.yaml"

0 commit comments

Comments
 (0)