Skip to content

Commit 8f87080

Browse files
committed
Make Job.dependencies Optional (List Text) to allow explicit empty arrays
1 parent 4b15574 commit 8f87080

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

GitLab/Job/Type.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ in { stage : Optional Text
2424
, image : Optional Image
2525
, variables : Prelude.Map.Type Text Text
2626
, rules : Optional (List Rule)
27-
, dependencies : List Text
27+
, dependencies : Optional (List Text)
2828
, needs : List Text
2929
, allow_failure : Bool
3030
, tags : Optional (List Text)

GitLab/Job/append.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let append
3737
, image = mergeOptional Image.Type Image.append a.image b.image
3838
, variables = a.variables # b.variables
3939
, rules = mergeOptionalList Rule.Type a.rules b.rules
40-
, dependencies = a.dependencies # b.dependencies
40+
, dependencies = mergeOptionalList Text a.dependencies b.dependencies
4141
, needs = a.needs # b.needs
4242
, allow_failure = b.allow_failure
4343
, tags = mergeOptionalList Text a.tags b.tags

GitLab/Job/default.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ in { stage = None Text
2424
, image = None Image
2525
, variables = Prelude.Map.empty Text Text
2626
, rules = None (List Rule)
27-
, dependencies = [] : List Text
27+
, dependencies = None (List Text)
2828
, needs = [] : List Text
2929
, allow_failure = False
3030
, tags = None (List Text)

GitLab/Job/toJSON.dhall

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ in let Job/toJSON
7070
)
7171
)
7272
, dependencies =
73-
if Prelude.List.null Text job.dependencies
73+
if Prelude.Optional.null (List Text) job.dependencies
7474
then None JSON.Type
75-
else Some (stringsArrayJSON job.dependencies)
75+
else let dependenciesList =
76+
optionalList Text job.dependencies
77+
78+
in Some (stringsArrayJSON dependenciesList)
7679
, needs =
7780
if Prelude.List.null Text job.needs
7881
then None JSON.Type

0 commit comments

Comments
 (0)