Skip to content

Commit 67b5384

Browse files
committed
Update extends to ignore empty lists (and not use Optional).
1 parent f809c13 commit 67b5384

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

GitLab/Job/Type.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ in { stage : Optional Text
3434
, environment : Optional Environment
3535
, trigger : Optional Trigger
3636
, timeout : Optional Text
37-
, extends : Optional (List Text)
37+
, extends : List Text
3838
}

GitLab/Job/append.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ let append
5959
, trigger =
6060
mergeOptional Trigger.Type Trigger.append a.trigger b.trigger
6161
, timeout = mergeOptionalRight Text a.timeout b.timeout
62-
, extends = mergeOptionalList Text a.extends b.extends
62+
, extends = a.extends # b.extends
6363
}
6464

6565
in append

GitLab/Job/default.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ in { stage = None Text
3434
, environment = None Environment
3535
, trigger = None Trigger
3636
, timeout = None Text
37-
, extends = None (List Text)
37+
, extends = [] : List Text
3838
}
3939
: ./Type.dhall

GitLab/Job/toJSON.dhall

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,17 @@ in let Job/toJSON
144144
, timeout =
145145
Optional/map Text JSON.Type JSON.string job.timeout
146146
, extends =
147-
Optional/map
148-
(List Text)
149-
JSON.Type
150-
stringsArrayJSON
151-
job.extends
147+
if Prelude.List.null Text job.extends
148+
then None JSON.Type
149+
else Some
150+
( JSON.array
151+
( Prelude.List.map
152+
Text
153+
JSON.Type
154+
JSON.string
155+
job.extends
156+
)
157+
)
152158
}
153159

154160
in JSON.object (dropNones Text JSON.Type everything)

0 commit comments

Comments
 (0)