Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request common-workflow-language#417 from common-workflow-…
Browse files Browse the repository at this point in the history
…language/fix-id-conflicts

Fix identifier conflicts (checked by cwltool for the first time)
tetron authored Mar 27, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents d038d86 + fcc593a commit 9930c4a
Showing 10 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions v1.0/v1.0/count-lines10-wf.cwl
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ steps:
out: [count_output]
run:
class: Workflow
id: subwf
inputs:
file1: File
outputs:
1 change: 1 addition & 0 deletions v1.0/v1.0/count-lines2-wf.cwl
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ steps:
out: [parseInt_output]
run:
class: ExpressionTool
id: subtool
inputs:
parseInt_file1:
type: File
1 change: 1 addition & 0 deletions v1.0/v1.0/scatter-valuefrom-wf1.cwl
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ steps:
scatter: echo_in
run:
class: CommandLineTool
id: subtool
inputs:
first:
type: string
1 change: 1 addition & 0 deletions v1.0/v1.0/scatter-valuefrom-wf5.cwl
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ steps:
scatter: echo_in
run:
class: CommandLineTool
id: subtool
inputs:
first:
type: string
1 change: 1 addition & 0 deletions v1.0/v1.0/scatter-wf1.cwl
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ steps:
scatter: echo_in
run:
class: CommandLineTool
id: subtool
inputs:
echo_in:
type: string
1 change: 1 addition & 0 deletions v1.1.0-dev1/v1.1.0-dev1/count-lines10-wf.cwl
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ steps:
out: [count_output]
run:
class: Workflow
id: subwf
inputs:
file1: File
outputs:
1 change: 1 addition & 0 deletions v1.1.0-dev1/v1.1.0-dev1/count-lines2-wf.cwl
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ steps:
out: [parseInt_output]
run:
class: ExpressionTool
id: subtool
inputs:
parseInt_file1:
type: File
1 change: 1 addition & 0 deletions v1.1.0-dev1/v1.1.0-dev1/scatter-valuefrom-wf1.cwl
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ steps:
scatter: echo_in
run:
class: CommandLineTool
id: subtool
inputs:
first:
type: string
1 change: 1 addition & 0 deletions v1.1.0-dev1/v1.1.0-dev1/scatter-valuefrom-wf5.cwl
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ steps:
scatter: echo_in
run:
class: CommandLineTool
id: subtool
inputs:
first:
type: string
1 change: 1 addition & 0 deletions v1.1.0-dev1/v1.1.0-dev1/scatter-wf1.cwl
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ steps:
scatter: echo_in
run:
class: CommandLineTool
id: subtool
inputs:
echo_in:
type: string

0 comments on commit 9930c4a

Please sign in to comment.