From 2ee87680556ccf26ef8d415950e7f31034d647c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Sun, 20 Apr 2025 22:58:16 +0200 Subject: =?UTF-8?q?Verbose=20option=20for=20=E2=80=98jobid=E2=80=99=20comm?= =?UTF-8?q?and?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Command/Run.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Command/Run.hs') diff --git a/src/Command/Run.hs b/src/Command/Run.hs index 593412c..6190236 100644 --- a/src/Command/Run.hs +++ b/src/Command/Run.hs @@ -136,7 +136,7 @@ argumentJobSource names = do return ( config, Just commit ) cidPart <- case jobsetCommit of - Just commit -> (: []) . JobIdTree Nothing . treeId <$> getCommitTree commit + Just commit -> (: []) . JobIdTree Nothing "" . treeId <$> getCommitTree commit Nothing -> return [] jobsetJobsEither <- fmap Right $ forM names $ \name -> case find ((name ==) . jobName) (configJobs config) of @@ -162,7 +162,7 @@ rangeSource base tip = do jobsets <- forM commits $ \commit -> do tree <- getCommitTree commit cmdEvalWith (\ei -> ei - { eiCurrentIdRev = JobIdTree Nothing (treeId tree) : eiCurrentIdRev ei + { eiCurrentIdRev = JobIdTree Nothing (treeSubdir tree) (treeId tree) : eiCurrentIdRev ei }) . evalJobSet [] =<< loadJobSetFromRoot root commit oneshotJobSource jobsets @@ -185,7 +185,7 @@ watchBranchSource branch = do jobsets <- forM commits $ \commit -> do tree <- getCommitTree commit let einput = einputBase - { eiCurrentIdRev = JobIdTree Nothing (treeId tree) : eiCurrentIdRev einputBase + { eiCurrentIdRev = JobIdTree Nothing (treeSubdir tree) (treeId tree) : eiCurrentIdRev einputBase } either (fail . T.unpack . textEvalError) return =<< flip runEval einput . evalJobSet [] =<< loadJobSetFromRoot root commit @@ -215,7 +215,7 @@ watchTagSource pat = do then do tree <- getCommitTree $ tagObject tag let einput = einputBase - { eiCurrentIdRev = JobIdTree Nothing (treeId tree) : eiCurrentIdRev einputBase + { eiCurrentIdRev = JobIdTree Nothing (treeSubdir tree) (treeId tree) : eiCurrentIdRev einputBase } jobset <- either (fail . T.unpack . textEvalError) return =<< flip runEval einput . evalJobSet [] =<< loadJobSetFromRoot root (tagObject tag) -- cgit v1.2.3