Evaluate jobs with all checkouts in the Eval monad

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Job/Types.hs b/src/Job/Types.hs
index 1ac329e..4024317 100644
--- a/src/Job/Types.hs
+++ b/src/Job/Types.hs
@@ -16,8 +16,7 @@ data Evaluated
 data Job' d = Job
     { jobId :: JobId' d
     , jobName :: JobName
-    , jobContainingCheckout :: [ JobCheckout ]
-    , jobOtherCheckout :: [ ( JobRepo d, JobCheckout ) ]
+    , jobCheckout :: [ JobCheckout d ]
     , jobRecipe :: [ CreateProcess ]
     , jobArtifacts :: [ ( ArtifactName, Pattern ) ]
     , jobUses :: [ ( JobName, ArtifactName ) ]
@@ -41,11 +40,12 @@ textJobName (JobName name) = name
 
 
 type family JobRepo d :: Type where
-    JobRepo Declared = ( RepoName, Maybe Text )
+    JobRepo Declared = Maybe ( RepoName, Maybe Text )
     JobRepo Evaluated = Tree
 
-data JobCheckout = JobCheckout
-    { jcSubtree :: Maybe FilePath
+data JobCheckout d = JobCheckout
+    { jcRepo :: JobRepo d
+    , jcSubtree :: Maybe FilePath
     , jcDestination :: Maybe FilePath
     }