Skip to content

Commit ebdebd0

Browse files
fabricebritofabricebrito
committed
fix(cwl): resolve graph schemas without replacing published imports
1 parent 82540e3 commit ebdebd0

20 files changed

Lines changed: 193 additions & 202 deletions

‎cwl-workflow/pattern-1.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ $graph:
6464
InlineJavascriptRequirement: {}
6565
SchemaDefRequirement:
6666
types:
67-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
68-
type: record
69-
fields:
70-
- name: value
71-
type: string
67+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
7268
- name: '#BBox'
7369
type: record
7470
fields:
@@ -164,11 +160,7 @@ $graph:
164160
ramMax: 2048
165161
SchemaDefRequirement:
166162
types:
167-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
168-
type: record
169-
fields:
170-
- name: value
171-
type: string
163+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
172164
- name: '#BBox'
173165
type: record
174166
fields:

‎cwl-workflow/pattern-10.cwl‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ $graph:
2121
InlineJavascriptRequirement: {}
2222
SchemaDefRequirement:
2323
types:
24-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
25-
type: record
26-
fields:
27-
- name: value
28-
type: string
24+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2925
- name: '#BBox'
3026
type: record
3127
fields:
@@ -124,11 +120,7 @@ $graph:
124120
InlineJavascriptRequirement: {}
125121
SchemaDefRequirement:
126122
types:
127-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
128-
type: record
129-
fields:
130-
- name: value
131-
type: string
123+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
132124
- name: '#BBox'
133125
type: record
134126
fields:
@@ -216,11 +208,7 @@ $graph:
216208
ramMax: 2048
217209
SchemaDefRequirement:
218210
types:
219-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
220-
type: record
221-
fields:
222-
- name: value
223-
type: string
211+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
224212
- name: '#BBox'
225213
type: record
226214
fields:
@@ -323,11 +311,7 @@ $graph:
323311
InlineJavascriptRequirement: {}
324312
SchemaDefRequirement:
325313
types:
326-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
327-
type: record
328-
fields:
329-
- name: value
330-
type: string
314+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
331315
- name: '#BBox'
332316
type: record
333317
fields:

‎cwl-workflow/pattern-11.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ $graph:
2020
InlineJavascriptRequirement: {}
2121
SchemaDefRequirement:
2222
types:
23-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
24-
type: record
25-
fields:
26-
- name: value
27-
type: string
23+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2824
- name: '#BBox'
2925
type: record
3026
fields:
@@ -122,11 +118,7 @@ $graph:
122118
ramMax: 2048
123119
SchemaDefRequirement:
124120
types:
125-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
126-
type: record
127-
fields:
128-
- name: value
129-
type: string
121+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
130122
- name: '#BBox'
131123
type: record
132124
fields:

‎cwl-workflow/pattern-12.cwl‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ $graph:
1313
SchemaDefRequirement:
1414
types:
1515
- $import: https://raw.githubusercontent.com/eoap/schemas/main/ogc.yaml
16-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
17-
type: record
18-
fields:
19-
- name: value
20-
type: string
16+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2117
- name: '#BBox'
2218
type: record
2319
fields:
@@ -145,11 +141,7 @@ $graph:
145141
SchemaDefRequirement:
146142
types:
147143
- $import: https://raw.githubusercontent.com/eoap/schemas/main/ogc.yaml
148-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
149-
type: record
150-
fields:
151-
- name: value
152-
type: string
144+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
153145
- name: '#BBox'
154146
type: record
155147
fields:
@@ -257,11 +249,7 @@ $graph:
257249
ramMax: 2048
258250
SchemaDefRequirement:
259251
types:
260-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
261-
type: record
262-
fields:
263-
- name: value
264-
type: string
252+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
265253
- name: '#BBox'
266254
type: record
267255
fields:
@@ -352,11 +340,7 @@ $graph:
352340
ramMax: 2048
353341
SchemaDefRequirement:
354342
types:
355-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
356-
type: record
357-
fields:
358-
- name: value
359-
type: string
343+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
360344
- name: '#BBox'
361345
type: record
362346
fields:

‎cwl-workflow/pattern-2.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ $graph:
2020
InlineJavascriptRequirement: {}
2121
SchemaDefRequirement:
2222
types:
23-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
24-
type: record
25-
fields:
26-
- name: value
27-
type: string
23+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2824
- name: '#BBox'
2925
type: record
3026
fields:
@@ -122,11 +118,7 @@ $graph:
122118
ramMax: 2048
123119
SchemaDefRequirement:
124120
types:
125-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
126-
type: record
127-
fields:
128-
- name: value
129-
type: string
121+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
130122
- name: '#BBox'
131123
type: record
132124
fields:

‎cwl-workflow/pattern-3.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ $graph:
2121
InlineJavascriptRequirement: {}
2222
SchemaDefRequirement:
2323
types:
24-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
25-
type: record
26-
fields:
27-
- name: value
28-
type: string
24+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2925
- name: '#BBox'
3026
type: record
3127
fields:
@@ -120,11 +116,7 @@ $graph:
120116
ramMax: 2048
121117
SchemaDefRequirement:
122118
types:
123-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
124-
type: record
125-
fields:
126-
- name: value
127-
type: string
119+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
128120
- name: '#BBox'
129121
type: record
130122
fields:

‎cwl-workflow/pattern-4.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ $graph:
1919
InlineJavascriptRequirement: {}
2020
SchemaDefRequirement:
2121
types:
22-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
23-
type: record
24-
fields:
25-
- name: value
26-
type: string
22+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2723
- name: '#BBox'
2824
type: record
2925
fields:
@@ -115,11 +111,7 @@ $graph:
115111
ramMax: 2048
116112
SchemaDefRequirement:
117113
types:
118-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
119-
type: record
120-
fields:
121-
- name: value
122-
type: string
114+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
123115
- name: '#BBox'
124116
type: record
125117
fields:

‎cwl-workflow/pattern-5.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ $graph:
2020
InlineJavascriptRequirement: {}
2121
SchemaDefRequirement:
2222
types:
23-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
24-
type: record
25-
fields:
26-
- name: value
27-
type: string
23+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2824
- name: '#BBox'
2925
type: record
3026
fields:
@@ -119,11 +115,7 @@ $graph:
119115
ramMax: 2048
120116
SchemaDefRequirement:
121117
types:
122-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
123-
type: record
124-
fields:
125-
- name: value
126-
type: string
118+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
127119
- name: '#BBox'
128120
type: record
129121
fields:

‎cwl-workflow/pattern-6.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ $graph:
2020
InlineJavascriptRequirement: {}
2121
SchemaDefRequirement:
2222
types:
23-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
24-
type: record
25-
fields:
26-
- name: value
27-
type: string
23+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2824
- name: '#BBox'
2925
type: record
3026
fields:
@@ -102,11 +98,7 @@ $graph:
10298
ramMax: 2048
10399
SchemaDefRequirement:
104100
types:
105-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
106-
type: record
107-
fields:
108-
- name: value
109-
type: string
101+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
110102
- name: '#BBox'
111103
type: record
112104
fields:

‎cwl-workflow/pattern-7.cwl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ $graph:
2020
InlineJavascriptRequirement: {}
2121
SchemaDefRequirement:
2222
types:
23-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
24-
type: record
25-
fields:
26-
- name: value
27-
type: string
23+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
2824
- name: '#BBox'
2925
type: record
3026
fields:
@@ -122,11 +118,7 @@ $graph:
122118
ramMax: 2048
123119
SchemaDefRequirement:
124120
types:
125-
- name: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml#URI
126-
type: record
127-
fields:
128-
- name: value
129-
type: string
121+
- $import: https://raw.githubusercontent.com/eoap/schemas/main/string_format.yaml
130122
- name: '#BBox'
131123
type: record
132124
fields:

0 commit comments

Comments
 (0)