Skip to content

Commit b9f1506

Browse files
mr-ctetron
mr-c
authored and
tetron
committed
update the mixed-versions tests for v1.3.0-dev1
1 parent 277b56d commit b9f1506

File tree

10 files changed

+214
-28
lines changed

10 files changed

+214
-28
lines changed

‎.github/workflows/cwltool.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
test_with_cwltool:
1616
runs-on: ubuntu-latest
1717
env:
18-
CWLTOOL_OPTIONS: "--parallel --relax-path-checks"
18+
CWLTOOL_OPTIONS: "--parallel --relax-path-checks --enable-dev"
1919
steps:
2020
- uses: actions/checkout@v4
2121

‎tests/mixed-versions/test-index.yaml‎

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,95 @@
77
- job: null
88
tool: wf-v10.cwl
99
id: mixed_version_v10_wf
10-
output: {}
10+
output:
11+
result0:
12+
class: File
13+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
14+
size: 10
15+
result1:
16+
class: File
17+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
18+
size: 10
19+
result2:
20+
class: File
21+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
22+
size: 10
23+
result3:
24+
class: File
25+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
26+
size: 10
1127
doc: test v1.0 workflow document that runs other versions
1228
tags: [ workflow ]
1329

1430
- job: null
1531
tool: wf-v11.cwl
1632
id: mixed_version_v11_wf
17-
output: {}
33+
output:
34+
result0:
35+
class: File
36+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
37+
size: 10
38+
result1:
39+
class: File
40+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
41+
size: 10
42+
result2:
43+
class: File
44+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
45+
size: 10
46+
result3:
47+
class: File
48+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
49+
size: 10
1850
doc: test v1.1 workflow document that runs other versions
1951
tags: [ workflow ]
2052

2153
- job: null
2254
tool: wf-v12.cwl
2355
id: mixed_version_v12_wf
24-
output: {}
56+
output:
57+
result0:
58+
class: File
59+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
60+
size: 10
61+
result1:
62+
class: File
63+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
64+
size: 10
65+
result2:
66+
class: File
67+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
68+
size: 10
69+
result3:
70+
class: File
71+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
72+
size: 10
2573
doc: test v1.2 workflow document that runs other versions
2674
tags: [ workflow ]
2775

76+
- job: null
77+
tool: wf-v13.cwl
78+
id: mixed_version_v13_wf
79+
output:
80+
result0:
81+
class: File
82+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
83+
size: 10
84+
result1:
85+
class: File
86+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
87+
size: 10
88+
result2:
89+
class: File
90+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
91+
size: 10
92+
result3:
93+
class: File
94+
checksum: sha1$1d6d222b15f3cf2308a6c09ab199fa8ca3f65c66
95+
size: 10
96+
doc: test v1.3.0-dev1 workflow document that runs other versions
97+
tags: [ workflow ]
98+
2899
- job: null
29100
tool: invalid-tool-v10.cwl
30101
id: invalid_syntax_v10_uses_v12_tool

‎tests/mixed-versions/tool-v10.cwl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ inputs:
55
type: File
66
secondaryFiles:
77
- ".2"
8-
outputs: []
9-
arguments: [echo, $(inputs.inp1)]
8+
outputs:
9+
result: stdout
10+
arguments: [echo, $(inputs.inp1.basename)]

‎tests/mixed-versions/tool-v11.cwl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ inputs:
66
secondaryFiles:
77
- pattern: ".2"
88
required: true
9-
outputs: []
10-
arguments: [echo, $(inputs.inp1)]
9+
outputs:
10+
result: stdout
11+
arguments: [echo, $(inputs.inp1.basename)]

‎tests/mixed-versions/tool-v12.cwl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ inputs:
99
requirements:
1010
ResourceRequirement:
1111
coresMin: .5
12-
outputs: []
13-
arguments: [echo, $(inputs.inp1)]
12+
outputs:
13+
result: stdout
14+
arguments: [echo, $(inputs.inp1.basename)]

‎tests/mixed-versions/tool-v13.cwl‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
cwlVersion: v1.3.0-dev1
2+
class: CommandLineTool
3+
inputs:
4+
inp1:
5+
type: File
6+
secondaryFiles:
7+
- pattern: ".2"
8+
required: true
9+
requirements:
10+
ResourceRequirement:
11+
coresMin: .5
12+
outputs:
13+
result: stdout
14+
arguments: [echo, $(inputs.inp1.basename)]

‎tests/mixed-versions/wf-v10.cwl‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cwlVersion: v1.0
22
class: Workflow
3+
34
inputs:
45
inp1:
56
type: File
@@ -8,17 +9,35 @@ inputs:
89
default:
910
class: File
1011
location: hello.txt
11-
outputs: []
12+
1213
steps:
1314
toolv10:
1415
in: {inp1: inp1}
15-
out: []
16+
out: [result]
1617
run: tool-v10.cwl
1718
toolv11:
1819
in: {inp1: inp1}
19-
out: []
20+
out: [result]
2021
run: tool-v11.cwl
2122
toolv12:
2223
in: {inp1: inp1}
23-
out: []
24+
out: [result]
2425
run: tool-v12.cwl
26+
toolv13:
27+
in: {inp1: inp1}
28+
out: [result]
29+
run: tool-v13.cwl
30+
31+
outputs:
32+
result0:
33+
type: File
34+
outputSource: toolv10/result
35+
result1:
36+
type: File
37+
outputSource: toolv11/result
38+
result2:
39+
type: File
40+
outputSource: toolv12/result
41+
result3:
42+
type: File
43+
outputSource: toolv13/result

‎tests/mixed-versions/wf-v11.cwl‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cwlVersion: v1.1
22
class: Workflow
3+
34
inputs:
45
inp1:
56
type: File
@@ -9,17 +10,35 @@ inputs:
910
default:
1011
class: File
1112
location: hello.txt
12-
outputs: []
13+
1314
steps:
1415
toolv10:
1516
in: {inp1: inp1}
16-
out: []
17+
out: [result]
1718
run: tool-v10.cwl
1819
toolv11:
1920
in: {inp1: inp1}
20-
out: []
21+
out: [result]
2122
run: tool-v11.cwl
2223
toolv12:
2324
in: {inp1: inp1}
24-
out: []
25+
out: [result]
2526
run: tool-v12.cwl
27+
toolv13:
28+
in: {inp1: inp1}
29+
out: [result]
30+
run: tool-v13.cwl
31+
32+
outputs:
33+
result0:
34+
type: File
35+
outputSource: toolv10/result
36+
result1:
37+
type: File
38+
outputSource: toolv11/result
39+
result2:
40+
type: File
41+
outputSource: toolv12/result
42+
result3:
43+
type: File
44+
outputSource: toolv13/result

‎tests/mixed-versions/wf-v12.cwl‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,44 @@
11
cwlVersion: v1.2
22
class: Workflow
3-
requirements:
4-
InlineJavascriptRequirement: {}
3+
54
inputs:
65
inp1:
76
type: File
8-
default:
9-
class: File
10-
location: hello.txt
117
secondaryFiles:
128
- pattern: ".2"
139
required: true
14-
outputs: []
10+
default:
11+
class: File
12+
location: hello.txt
13+
1514
steps:
1615
toolv10:
1716
in: {inp1: inp1}
18-
out: []
17+
out: [result]
1918
run: tool-v10.cwl
2019
toolv11:
2120
in: {inp1: inp1}
22-
out: []
21+
out: [result]
2322
run: tool-v11.cwl
2423
toolv12:
2524
in: {inp1: inp1}
26-
out: []
27-
when: $(true)
25+
out: [result]
2826
run: tool-v12.cwl
27+
toolv13:
28+
in: {inp1: inp1}
29+
out: [result]
30+
run: tool-v13.cwl
31+
32+
outputs:
33+
result0:
34+
type: File
35+
outputSource: toolv10/result
36+
result1:
37+
type: File
38+
outputSource: toolv11/result
39+
result2:
40+
type: File
41+
outputSource: toolv12/result
42+
result3:
43+
type: File
44+
outputSource: toolv13/result

‎tests/mixed-versions/wf-v13.cwl‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
cwlVersion: v1.3.0-dev1
2+
class: Workflow
3+
4+
inputs:
5+
inp1:
6+
type: File
7+
secondaryFiles:
8+
- pattern: ".2"
9+
required: true
10+
default:
11+
class: File
12+
location: hello.txt
13+
14+
steps:
15+
toolv10:
16+
in: {inp1: inp1}
17+
out: [result]
18+
run: tool-v10.cwl
19+
toolv11:
20+
in: {inp1: inp1}
21+
out: [result]
22+
run: tool-v11.cwl
23+
toolv12:
24+
in: {inp1: inp1}
25+
out: [result]
26+
run: tool-v12.cwl
27+
toolv13:
28+
in: {inp1: inp1}
29+
out: [result]
30+
run: tool-v13.cwl
31+
32+
outputs:
33+
result0:
34+
type: File
35+
outputSource: toolv10/result
36+
result1:
37+
type: File
38+
outputSource: toolv11/result
39+
result2:
40+
type: File
41+
outputSource: toolv12/result
42+
result3:
43+
type: File
44+
outputSource: toolv13/result

0 commit comments

Comments
 (0)