From a8f1e216681a1f03e15b8b71d1f83f7aa3493617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Sat, 12 Apr 2025 15:16:30 +0200
Subject: Track other used repos in job ID

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

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

diff --git a/src/Job/Types.hs b/src/Job/Types.hs
index 19cf560..b5d05fb 100644
--- a/src/Job/Types.hs
+++ b/src/Job/Types.hs
@@ -17,7 +17,7 @@ data Job' d = Job
     { jobId :: JobId' d
     , jobName :: JobName
     , jobContainingCheckout :: [ JobCheckout ]
-    , jobOtherCheckout :: [ ( JobRepo d, Maybe Text, JobCheckout ) ]
+    , jobOtherCheckout :: [ ( JobRepo d, JobCheckout ) ]
     , jobRecipe :: [ CreateProcess ]
     , jobArtifacts :: [ ( ArtifactName, Pattern ) ]
     , jobUses :: [ ( JobName, ArtifactName ) ]
@@ -41,8 +41,8 @@ textJobName (JobName name) = name
 
 
 type family JobRepo d :: Type where
-    JobRepo Declared = RepoName
-    JobRepo Evaluated = Repo
+    JobRepo Declared = ( RepoName, Maybe Text )
+    JobRepo Evaluated = Tree
 
 data JobCheckout = JobCheckout
     { jcSubtree :: Maybe FilePath
@@ -71,8 +71,8 @@ newtype JobId = JobId [ JobIdPart ]
 
 data JobIdPart
     = JobIdName JobName
-    | JobIdCommit CommitId
-    | JobIdTree TreeId
+    | JobIdCommit (Maybe RepoName) CommitId
+    | JobIdTree (Maybe RepoName) TreeId
     deriving (Eq, Ord)
 
 newtype JobRef = JobRef [ Text ]
@@ -81,8 +81,8 @@ newtype JobRef = JobRef [ Text ]
 textJobIdPart :: JobIdPart -> Text
 textJobIdPart = \case
     JobIdName name -> textJobName name
-    JobIdCommit cid -> textCommitId cid
-    JobIdTree tid -> textTreeId tid
+    JobIdCommit _ cid -> textCommitId cid
+    JobIdTree _ tid -> textTreeId tid
 
 textJobId :: JobId -> Text
 textJobId (JobId ids) = T.intercalate "." $ map textJobIdPart ids
-- 
cgit v1.2.3