From c11cf4ea1822b280be7873c61c004d23627b0349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Wed, 26 Nov 2025 21:38:01 +0100 Subject: Well-defined order of dependencies in job ID --- src/Eval.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Eval.hs') diff --git a/src/Eval.hs b/src/Eval.hs index e98bb29..71c9b9f 100644 --- a/src/Eval.hs +++ b/src/Eval.hs @@ -81,7 +81,9 @@ collectOtherRepos dset decl = do ] let commonSubdir reporev = joinPath $ foldr1 commonPrefix $ map (maybe [] splitDirectories . jcSubtree) . filter ((reporev ==) . jcRepo) $ checkouts - return $ map (\r -> ( r, commonSubdir r )) . nub . map jcRepo $ checkouts + let canonicalRepoOrder = Nothing : maybe [] (map (Just . repoName) . configRepos) (jobsetConfig dset) + getCheckoutsForName rname = map (\r -> ( r, commonSubdir r )) $ nub $ filter ((rname ==) . fmap fst) $ map jcRepo checkouts + return $ concatMap getCheckoutsForName canonicalRepoOrder evalJob :: [ ( Maybe RepoName, Tree ) ] -> DeclaredJobSet -> DeclaredJob -> Eval ( Job, JobSetId ) -- cgit v1.2.3