Skip to content
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.

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

v1.2.1 errata #280

Merged
merged 3 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions CommandLineTool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ $graph:
* CWL has been assigned an official IANA Media Type of [`application/cwl`](https://www.iana.org/assignments/media-types/application/cwl)
for either JSON or YAML format. For JSON formatted CWL documents, [`application/cwl+json`](https://www.iana.org/assignments/media-types/application/cwl+json)
has also been assigned and can be used. For specifying a YAML formatted
CWL document, one can use `application/cwl+yaml` but that is not an official
IANA media-type yet; as of 2023-07-23 the `+yaml` suffix has yet to be approved.
CWL document, one can use [`application/cwl+yaml`](https://www.iana.org/assignments/media-types/application/cwl+yaml).
The above has been documented in the [Syntax](#Syntax) section.
* There is now an unofficial [JSON Schema for CWL documents](https://github.com/common-workflow-language/cwl-v1.2/blob/1.2.1_proposed/json-schema/cwl.yaml),
donated by Francis Charette-Migneault. This schema captures much, but not
Expand Down
2 changes: 1 addition & 1 deletion Process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $namespaces:

$graph:

- name: "Common Workflow Language, v1.2"
- name: "Common Workflow Language, v1.2.1"
type: documentation
doc: {$include: concepts.md}

Expand Down
5 changes: 2 additions & 3 deletions Workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $graph:
type: documentation
doc:
- |
# Common Workflow Language (CWL) Workflow Description, v1.2
# Common Workflow Language (CWL) Workflow Description, v1.2.1

This version:
* https://w3id.org/cwl/v1.2/
Expand Down Expand Up @@ -55,8 +55,7 @@ $graph:
* CWL has been assigned an official IANA Media Type of [`application/cwl`](https://www.iana.org/assignments/media-types/application/cwl)
for either JSON or YAML format. For JSON formatted CWL documents, [`application/cwl+json`](https://www.iana.org/assignments/media-types/application/cwl+json)
has also been assigned and can be used. For specifying a YAML formatted
CWL document, one can use `application/cwl+yaml` but that is not an official
IANA media-type yet; as of 2023-07-23 the `+yaml` suffix has yet to be approved.
CWL document, one can use [`application/cwl+yaml`](https://www.iana.org/assignments/media-types/application/cwl+yaml).
The above has been documented in the [Syntax](#Syntax) section.
* There is now an unofficial [JSON Schema for CWL documents](https://github.com/common-workflow-language/cwl-v1.2/blob/1.2.1_proposed/json-schema/cwl.yaml),
donated by Francis Charette-Migneault. This schema captures much, but not
Expand Down
3 changes: 1 addition & 2 deletions concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ The official IANA media-type for CWL documents is [`application/cwl`](https://ww
for either JSON or YAML format. For JSON formatted CWL documents,
[`application/cwl+json`](https://www.iana.org/assignments/media-types/application/cwl+json)
can be used. For specifying a YAML formatted CWL document, one can use
`application/cwl+yaml` but that is not an official IANA media-type yet; as of
2023-07-23 the `+yaml` suffix has yet to be approved.
[`application/cwl+yaml`](https://www.iana.org/assignments/media-types/application/cwl+yaml).

CWL documents commonly reference other CWL documents. Each document
must declare the `cwlVersion` of that document. Implementations must
Expand Down
1 change: 1 addition & 0 deletions cwl-runner.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ inputs:

processfile:
type: File?
format: [iana:application/cwl, iana:application/cwl+json, iana:application/cwl+yaml]
doc: |
The CommandLineTool, ExpressionTool, or Workflow description to run.
Optional if the jobfile has a `cwl:tool` field to indicate which process
Expand Down
4 changes: 2 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Common Workflow Language Standards, v1.2
# Common Workflow Language Standards, v1.2.1

The [User Guide](http://www.commonwl.org/user_guide/) provides a gentle
introduction to writing CWL command line tools and workflows. Currently the CWL User Guide targets CWL v1.0 only.
introduction to writing CWL command line tools and workflows.

The CWL [Command Line Tool Description Standard](CommandLineTool.html)
specifies the document schema and execution semantics for wrapping and
Expand Down