Skip to content

Commit

Permalink
Merge pull request common-workflow-language#328 from StarvingMarvin/m…
Browse files Browse the repository at this point in the history
…aster

Fixing mentions to draft3/4
  • Loading branch information
mr-c committed Nov 1, 2016
2 parents a4950f4 + d906c4a commit e0a5e7c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion v1.0/concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ preprocessing steps described in the
[Semantic Annotations for Linked Avro Data (SALAD) Specification](SchemaSalad.html).
An implementation may formally validate the structure of a CWL document using
SALAD schemas located at
https://github.com/common-workflow-language/common-workflow-language/tree/master/draft-4
https://github.com/common-workflow-language/common-workflow-language/tree/master/v1.0

## Identifiers

Expand Down
8 changes: 4 additions & 4 deletions v1.0/conformance_test_v1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -789,10 +789,10 @@
- job: v1.0/dir4-job.yml
output: {
"outlist": {
"checksum": "sha1$2ab6f189e84753c05a23413fbf6b6fbf4c53489f",
"size": 90,
"location": "output.txt",
"class": "File"
"checksum": "sha1$13cda8661796ae241da3a18668fb552161a72592",
"size": 20,
"location": "output.txt",
"class": "File"
}
}
tool: v1.0/dir4.cwl
Expand Down
4 changes: 2 additions & 2 deletions v1.0/salad/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ provides for robust support of inline documentation.
.. _JSON-LD: http://json-ld.org
.. _Avro: http://avro.apache.org
.. _metaschema: https://github.com/common-workflow-language/schema_salad/blob/master/schema_salad/metaschema/metaschema.yml
.. _specification: http://www.commonwl.org/draft-3/SchemaSalad.html
.. _Language: https://github.com/common-workflow-language/common-workflow-language/blob/master/draft-3/CommandLineTool.yml
.. _specification: http://www.commonwl.org/v1.0/SchemaSalad.html
.. _Language: https://github.com/common-workflow-language/common-workflow-language/blob/master/v1.0/CommandLineTool.yml
.. _RDF: https://www.w3.org/RDF/
4 changes: 2 additions & 2 deletions v1.0/v1.0/dir4.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ outputs:
type: File
outputBinding:
glob: output.txt
arguments: ["cd", "$(inputs.inf.dirname)",
arguments: ["cd", "$(inputs.inf.dirname)/xtestdir",
{shellQuote: false, valueFrom: "&&"},
"find", ".",
{shellQuote: false, valueFrom: "|"},
"sort"]
stdout: output.txt
stdout: output.txt

0 comments on commit e0a5e7c

Please sign in to comment.