From f1beff8cdbf5a2e54ea5e36b6edf337fc45ffc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Sun, 29 Jun 2025 08:58:37 +0200
Subject: Gather related jobs passed by refs to jobsets

---
 src/Command/Run.hs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Command/Run.hs b/src/Command/Run.hs
index 9652529..ca6d275 100644
--- a/src/Command/Run.hs
+++ b/src/Command/Run.hs
@@ -150,8 +150,17 @@ argumentJobSource names = do
 refJobSource :: [ JobRef ] -> CommandExec JobSource
 refJobSource [] = emptyJobSource
 refJobSource refs = do
-    jobs <- cmdEvalWith id $ mapM evalJobReference refs
-    oneshotJobSource . map (JobSet Nothing . Right . (: [])) $ jobs
+    jobs <- foldl' addJobToList [] <$> cmdEvalWith id (mapM evalJobReference refs)
+    oneshotJobSource . map (JobSet Nothing . Right . reverse) $ jobs
+  where
+    deriveSetId :: Job -> [ JobIdPart ]
+    deriveSetId job = let JobId parts = jobId job in init parts
+
+    addJobToList :: [[ Job ]] -> Job -> [[ Job ]]
+    addJobToList (js@(j : _) : rest) job
+        | deriveSetId j == deriveSetId job = (job : js) : rest
+        | otherwise                        = js : addJobToList rest job
+    addJobToList _ job                     = [[ job ]]
 
 loadJobSetFromRoot :: (MonadIO m, MonadFail m) => JobRoot -> Commit -> m DeclaredJobSet
 loadJobSetFromRoot root commit = case root of
-- 
cgit v1.2.3