Merge pull request #9 from Soostone/various-additions

Various additions

Author: bgamari

GitLab/ArtifactsSpec/append.dhall

@@ -0,0 +1,16 @@
+let ArtifactsSpec = ./Type.dhall
+
+let mergeOptionalRight = ../utils/mergeOptionalRight.dhall
+
+let append
+    : ArtifactsSpec → ArtifactsSpec → ArtifactsSpec
+    = λ(a : ArtifactsSpec) →
+      λ(b : ArtifactsSpec) →
+        { when = b.when
+        , expire_in = b.expire_in
+        , reports.junit =
+            mergeOptionalRight Text a.reports.junit b.reports.junit
+        , paths = a.paths # b.paths
+        }
+
+in  append

GitLab/ArtifactsSpec/package.dhall

@@ -1 +1,5 @@
-{ Type = ./Type.dhall, default = ./default.dhall, toJSON = ./toJSON.dhall }
+{ Type = ./Type.dhall
+, default = ./default.dhall
+, toJSON = ./toJSON.dhall
+, append = ./append.dhall
+}

GitLab/CachePolicy/Type.dhall

@@ -0,0 +1 @@
+< Pull | Push | PullPush >

GitLab/CachePolicy/package.dhall

@@ -0,0 +1 @@
+{ Type = ./Type.dhall, toJSON = ./toJSON.dhall }

GitLab/CachePolicy/toJSON.dhall

@@ -0,0 +1,16 @@
+let Prelude = ../Prelude.dhall
+
+let JSON = Prelude.JSON
+
+let CachePolicy = ./Type.dhall
+
+let CachePolicy/toJSON
+    : CachePolicy → JSON.Type
+    = λ(policy : CachePolicy) →
+        JSON.string
+          ( merge
+              { Pull = "pull", Push = "push", PullPush = "pull-push" }
+              policy
+          )
+
+in  CachePolicy/toJSON

GitLab/CacheSpec/Type.dhall

@@ -1 +1,10 @@
-{ key : Text, paths : List Text }
+let When = ../When/Type.dhall
+
+let CachePolicy = ../CachePolicy/Type.dhall
+
+in  { key : Text
+    , paths : List Text
+    , untracked : Optional Bool
+    , when : When
+    , policy : Optional CachePolicy
+    }

GitLab/CacheSpec/append.dhall

@@ -0,0 +1,18 @@
+let CacheSpec = ./Type.dhall
+
+let CachePolicy = ../CachePolicy/Type.dhall
+
+let mergeOptionalRight = ../utils/mergeOptionalRight.dhall
+
+let append
+    : CacheSpec → CacheSpec → CacheSpec
+    = λ(a : CacheSpec) →
+      λ(b : CacheSpec) →
+        { key = b.key
+        , paths = a.paths # b.paths
+        , untracked = mergeOptionalRight Bool a.untracked b.untracked
+        , when = b.when
+        , policy = mergeOptionalRight CachePolicy a.policy b.policy
+        }
+
+in  append

GitLab/CacheSpec/package.dhall

@@ -1 +1 @@
-{ Type = ./Type.dhall, toJSON = ./toJSON.dhall }
+{ Type = ./Type.dhall, toJSON = ./toJSON.dhall, append = ./append.dhall }

GitLab/Defaults/Type.dhall

@@ -0,0 +1,12 @@
+let Prelude = ../Prelude.dhall
+
+let Service = ../Service/Type.dhall
+
+let CacheSpec = ../CacheSpec/Type.dhall
+
+in  { image : Optional Text
+    , before_script : List Text
+    , after_script : List Text
+    , services : List Service
+    , cache : Optional CacheSpec
+    }

GitLab/Defaults/default.dhall

@@ -0,0 +1,13 @@
+let Defaults = ./Type.dhall
+
+let Service = ../Service/Type.dhall
+
+let CacheSpec = ../CacheSpec/Type.dhall
+
+in    { image = None Text
+      , before_script = [] : List Text
+      , after_script = [] : List Text
+      , services = [] : List Service
+      , cache = None CacheSpec
+      }
+    : Defaults