Skip to content

put the Salad schemas on the website #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mr-c wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

put the Salad schemas on the website #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 38 additions & 1 deletion site/cwlsite-v1.0.0-job.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,44 @@
"brandlink": "../index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": null,
"extra": []
"extra": [
{
"class": "File",
"path": "../v1.0/CommonWorkflowLanguage.yml"
},
{
"class": "File",
"path": "../v1.0/Process.yml"
},
{
"class": "File",
"path": "../v1.0/CommandLineTool.yml"
},
{
"class": "File",
"path": "../v1.0/Workflow.yml"
},
{
"class": "File",
"path": "../v1.0/metaschema_base.yml"
},
{
"class": "File",
"path": "../v1.0/concepts.md"
},
{
"class": "File",
"path": "../v1.0/invocation.md"
},
{
"class": "File",
"path": "../v1.0/intro.md"
},
{
"class": "File",
"path": "../v1.0/contrib.md"
}
]
},
{
"source": {
Expand Down
12 changes: 11 additions & 1 deletion site/cwlsite-v1.1.0-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@
renderlist: []
source: {class: File, path: ../v1.1/index.md}
target: v1.1/index.html
extra: []
extra: [
{class: File, path: ../v1.1/CommonWorkflowLanguage.yml},
{class: File, path: ../v1.1/Process.yml},
{class: File, path: ../v1.1/CommandLineTool.yml},
{class: File, path: ../v1.1/Workflow.yml},
{class: File, path: ../v1.1/metaschema_base.yml},
{class: File, path: ../v1.1/concepts.md},
{class: File, path: ../v1.1/invocation.md},
{class: File, path: ../v1.1/intro.md},
{class: File, path: ../v1.1/contrib.md},
]
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand Down
13 changes: 12 additions & 1 deletion site/cwlsite-v1.2-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,18 @@
renderlist: []
source: {class: File, path: ../v1.2/index.md}
target: v1.2/index.html
extra: []
extra: [
{class: File, path: ../v1.2/CommonWorkflowLanguage.yml},
{class: File, path: ../v1.2/Process.yml},
{class: File, path: ../v1.2/Operation.yml},
{class: File, path: ../v1.2/CommandLineTool.yml},
{class: File, path: ../v1.2/Workflow.yml},
{class: File, path: ../v1.2/metaschema_base.yml},
{class: File, path: ../v1.2/concepts.md},
{class: File, path: ../v1.2/invocation.md},
{class: File, path: ../v1.2/intro.md},
{class: File, path: ../v1.2/contrib.md},
]
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand Down
14 changes: 13 additions & 1 deletion site/cwlsite-v1.3-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,19 @@
renderlist: []
source: {class: File, path: ../v1.3/index.md}
target: v1.3/index.html
extra: []
extra: [
{class: File, path: ../v1.3/CommonWorkflowLanguage.yml},
{class: File, path: ../v1.3/Base.yml},
{class: File, path: ../v1.3/Process.yml},
{class: File, path: ../v1.3/Operation.yml},
{class: File, path: ../v1.3/CommandLineTool.yml},
{class: File, path: ../v1.3/Workflow.yml},
{class: File, path: ../v1.3/metaschema_base.yml},
{class: File, path: ../v1.3/concepts.md},
{class: File, path: ../v1.3/invocation.md},
{class: File, path: ../v1.3/intro.md},
{class: File, path: ../v1.3/contrib.md},
]
- brandimg: '<img src=''../CWL-Logo-Header.png'' style=''height: 61px; margin-top:
-20px; margin-left: -20px''></img>'
brandlink: index.html
Expand Down
24 changes: 3 additions & 21 deletions site/v1.0.0-deps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,9 @@
"location": "../v1.0/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.0/salad/schema_salad/metaschema/metaschema_base.yml"
}
]
}
]
}
]
"basename": "metaschema_base.yml",
"class": "File",
"location": "../v1.0/metaschema_base.yml"
}
],
"basename": "Process.yml",
Expand Down
11 changes: 1 addition & 10 deletions site/v1.1.0-deps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,7 @@
location: ../v1.1/Process.yml
secondaryFiles:
- {basename: concepts.md, class: File, location: ../v1.1/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.1/salad/schema_salad/metaschema/metaschema_base.yml}
- {basename: metaschema_base.yml, class: File, location: ../v1.1/metaschema_base.yml}
- basename: CommandLineTool.yml
class: File
location: ../v1.1/CommandLineTool.yml
Expand Down
11 changes: 1 addition & 10 deletions site/v1.2-deps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,7 @@
location: ../v1.2/Process.yml
secondaryFiles:
- {basename: concepts.md, class: File, location: ../v1.2/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.2/salad/schema_salad/metaschema/metaschema_base.yml}
- {basename: metaschema_base.yml, class: File, location: ../v1.2/metaschema_base.yml}
- basename: CommandLineTool.yml
class: File
location: ../v1.2/CommandLineTool.yml
Expand Down
11 changes: 1 addition & 10 deletions site/v1.3-deps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,7 @@
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: metaschema_base.yml, class: File, location: ../v1.3/metaschema_base.yml}
- basename: CommandLineTool.yml
class: File
location: ../v1.3/CommandLineTool.yml
Expand Down
11 changes: 9 additions & 2 deletions website.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ for repo in https://github.com/common-workflow-language/common-workflow-language
https://github.com/common-workflow-lab/cwl-novice-tutorial ; do
bn=$(basename $repo)
if [[ -d $bn ]] ; then
(cd $bn && git fetch origin && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD))
(cd "$bn" && git fetch origin && git reset --hard "origin/$(git rev-parse --abbrev-ref HEAD)")
else
git clone $repo
fi
Expand All @@ -23,10 +23,17 @@ ln -s cwl-v1.1 v1.1
ln -s cwl-v1.2 v1.2
ln -s cwl-v1.3 v1.3

for ver in v1.0 v1.1 v1.2 v1.3 ; do
cd "${ver}" && \
git grep -l /metaschema_base | xargs sed -i 's=salad/schema_salad/metaschema/metaschema_base.yml=metaschema_base.yml=g' && \
cp salad/schema_salad/metaschema/metaschema_base.yml metaschema_base.yml
cd -
done

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

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