From 4f1121a15d65d5defa7c6e477ed5124b934c461f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Sat, 24 May 2025 21:17:13 +0200
Subject: Evaluate jobs with all checkouts in the Eval monad

---
 src/Job/Types.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/Job/Types.hs')

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
     }
 
-- 
cgit v1.2.3