Skip to content

Commit 5e017ae

Browse files
committed
1 parent be33b6c commit 5e017ae

15 files changed

+12223
-14
lines changed

v1.2/CommandLineTool.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,7 @@ <h2 id="Changelog_for_v1.2.1" class="section">1.2 Changelog for v1.2.1 <a href="
280280
<li>CWL has been assigned an official IANA Media Type of <a href="https://www.iana.org/assignments/media-types/application/cwl"><code>application/cwl</code></a>
281281
for either JSON or YAML format. For JSON formatted CWL documents, <a href="https://www.iana.org/assignments/media-types/application/cwl+json"><code>application/cwl+json</code></a>
282282
has also been assigned and can be used. For specifying a YAML formatted
283-
CWL document, one can use <code>application/cwl+yaml</code> but that is not an official
284-
IANA media-type yet; as of 2023-07-23 the <code>+yaml</code> suffix has yet to be approved.
283+
CWL document, one can use <a href="https://www.iana.org/assignments/media-types/application/cwl+yaml"><code>application/cwl+yaml</code></a>.
285284
The above has been documented in the <a href="#Syntax">Syntax</a> section.</li>
286285
<li>There is now an unofficial <a href="https://github.com/common-workflow-language/cwl-v1.2/blob/1.2.1_proposed/json-schema/cwl.yaml">JSON Schema for CWL documents</a>,
287286
donated by Francis Charette-Migneault. This schema captures much, but not
@@ -637,8 +636,7 @@ <h2 id="Syntax" class="section">2.2 Syntax <a href="#Syntax">&sect;</a></h2><p>C
637636
for either JSON or YAML format. For JSON formatted CWL documents,
638637
<a href="https://www.iana.org/assignments/media-types/application/cwl+json"><code>application/cwl+json</code></a>
639638
can be used. For specifying a YAML formatted CWL document, one can use
640-
<code>application/cwl+yaml</code> but that is not an official IANA media-type yet; as of
641-
2023-07-23 the <code>+yaml</code> suffix has yet to be approved.</p>
639+
<a href="https://www.iana.org/assignments/media-types/application/cwl+yaml"><code>application/cwl+yaml</code></a>.</p>
642640
<p>CWL documents commonly reference other CWL documents. Each document
643641
must declare the <code>cwlVersion</code> of that document. Implementations must
644642
validate against the document's declared version. Implementations

v1.2/Workflow.html

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<script src="https://cdn.rawgit.com/scottjehl/picturefill/3.0.2/dist/picturefill.min.js"
1818
integrity="sha384-ZJsVW8YHHxQHJ+SJDncpN90d0EfAhPP+yA94n+EhSRzhcxfo84yMnNk+v37RGlWR"
1919
crossorigin="anonymous" async></script>
20-
<title>Common Workflow Language (CWL) Workflow Description, v1.2</title>
20+
<title>Common Workflow Language (CWL) Workflow Description, v1.2.1</title>
2121
<style>
2222
:target {
2323
padding-top: 61px;
@@ -126,7 +126,7 @@
126126

127127
<div class="row">
128128

129-
<div class="col-md-12" role="main" id="main"><h1 id="Common_Workflow_Language_(CWL)_Workflow_Description,_v1.2" class="section">Common Workflow Language (CWL) Workflow Description, v1.2 <a href="#Common_Workflow_Language_(CWL)_Workflow_Description,_v1.2">&sect;</a></h1><p>This version:</p>
129+
<div class="col-md-12" role="main" id="main"><h1 id="Common_Workflow_Language_(CWL)_Workflow_Description,_v1.2.1" class="section">Common Workflow Language (CWL) Workflow Description, v1.2.1 <a href="#Common_Workflow_Language_(CWL)_Workflow_Description,_v1.2.1">&sect;</a></h1><p>This version:</p>
130130
<ul>
131131
<li><a href="https://w3id.org/cwl/v1.2/">https://w3id.org/cwl/v1.2/</a></li>
132132
</ul>
@@ -172,7 +172,7 @@ <h1 id="Status_of_this_document" class="section">Status of this document <a href
172172
<p>The products of the CWL working group (including this document) are made available
173173
under the terms of the Apache License, version 2.0.</p>
174174
<h1 id="toc">Table of contents</h1>
175-
<nav class="tocnav"><ol><li><a href="#Common_Workflow_Language_(CWL)_Workflow_Description,_v1.2"> Common Workflow Language (CWL) Workflow Description, v1.2</a><ol>
175+
<nav class="tocnav"><ol><li><a href="#Common_Workflow_Language_(CWL)_Workflow_Description,_v1.2.1"> Common Workflow Language (CWL) Workflow Description, v1.2.1</a><ol>
176176
</ol><li><a href="#Abstract"> Abstract</a><ol>
177177
</ol><li><a href="#Status_of_this_document"> Status of this document</a><ol>
178178
</ol><li><a href="#Introduction">1. Introduction</a><ol>
@@ -283,8 +283,7 @@ <h2 id="Changelog_for_v1.2.1" class="section">1.2 Changelog for v1.2.1 <a href="
283283
<li>CWL has been assigned an official IANA Media Type of <a href="https://www.iana.org/assignments/media-types/application/cwl"><code>application/cwl</code></a>
284284
for either JSON or YAML format. For JSON formatted CWL documents, <a href="https://www.iana.org/assignments/media-types/application/cwl+json"><code>application/cwl+json</code></a>
285285
has also been assigned and can be used. For specifying a YAML formatted
286-
CWL document, one can use <code>application/cwl+yaml</code> but that is not an official
287-
IANA media-type yet; as of 2023-07-23 the <code>+yaml</code> suffix has yet to be approved.
286+
CWL document, one can use <a href="https://www.iana.org/assignments/media-types/application/cwl+yaml"><code>application/cwl+yaml</code></a>.
288287
The above has been documented in the <a href="#Syntax">Syntax</a> section.</li>
289288
<li>There is now an unofficial <a href="https://github.com/common-workflow-language/cwl-v1.2/blob/1.2.1_proposed/json-schema/cwl.yaml">JSON Schema for CWL documents</a>,
290289
donated by Francis Charette-Migneault. This schema captures much, but not
@@ -540,8 +539,7 @@ <h2 id="Syntax" class="section">2.2 Syntax <a href="#Syntax">&sect;</a></h2><p>C
540539
for either JSON or YAML format. For JSON formatted CWL documents,
541540
<a href="https://www.iana.org/assignments/media-types/application/cwl+json"><code>application/cwl+json</code></a>
542541
can be used. For specifying a YAML formatted CWL document, one can use
543-
<code>application/cwl+yaml</code> but that is not an official IANA media-type yet; as of
544-
2023-07-23 the <code>+yaml</code> suffix has yet to be approved.</p>
542+
<a href="https://www.iana.org/assignments/media-types/application/cwl+yaml"><code>application/cwl+yaml</code></a>.</p>
545543
<p>CWL documents commonly reference other CWL documents. Each document
546544
must declare the <code>cwlVersion</code> of that document. Implementations must
547545
validate against the document's declared version. Implementations

v1.2/cwl-runner.cwl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ inputs:
2929

3030
processfile:
3131
type: File?
32+
format: [iana:application/cwl, iana:application/cwl+json, iana:application/cwl+yaml]
3233
doc: |
3334
The CommandLineTool, ExpressionTool, or Workflow description to run.
3435
Optional if the jobfile has a `cwl:tool` field to indicate which process

v1.2/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<script src="https://cdn.rawgit.com/scottjehl/picturefill/3.0.2/dist/picturefill.min.js"
1818
integrity="sha384-ZJsVW8YHHxQHJ+SJDncpN90d0EfAhPP+yA94n+EhSRzhcxfo84yMnNk+v37RGlWR"
1919
crossorigin="anonymous" async></script>
20-
<title>Common Workflow Language Standards, v1.2</title>
20+
<title>Common Workflow Language Standards, v1.2.1</title>
2121
<style>
2222
:target {
2323
padding-top: 61px;
@@ -122,8 +122,8 @@
122122

123123
<div class="row">
124124

125-
<div class="col-md-12" role="main" id="main"><h1 id="Common_Workflow_Language_Standards,_v1.2" class="section">Common Workflow Language Standards, v1.2 <a href="#Common_Workflow_Language_Standards,_v1.2">&sect;</a></h1><p>The <a href="http://www.commonwl.org/user_guide/">User Guide</a> provides a gentle
126-
introduction to writing CWL command line tools and workflows. Currently the CWL User Guide targets CWL v1.0 only.</p>
125+
<div class="col-md-12" role="main" id="main"><h1 id="Common_Workflow_Language_Standards,_v1.2.1" class="section">Common Workflow Language Standards, v1.2.1 <a href="#Common_Workflow_Language_Standards,_v1.2.1">&sect;</a></h1><p>The <a href="http://www.commonwl.org/user_guide/">User Guide</a> provides a gentle
126+
introduction to writing CWL command line tools and workflows.</p>
127127
<p>The CWL <a href="CommandLineTool.html">Command Line Tool Description Standard</a>
128128
specifies the document schema and execution semantics for wrapping and
129129
executing command line tools.</p>

0 commit comments

Comments
 (0)