diff options
| author | Roman Smrž <roman.smrz@seznam.cz> | 2025-04-12 15:16:30 +0200 |
|---|---|---|
| committer | Roman Smrž <roman.smrz@seznam.cz> | 2025-04-12 21:04:14 +0200 |
| commit | a8f1e216681a1f03e15b8b71d1f83f7aa3493617 (patch) | |
| tree | d76481ca10a6d780d527bd16755dbcd7cf739190 /src/Command | |
| parent | d6c4daa2fb0b7f8dd0afb3ef50b2b85106bfd2ac (diff) | |
Track other used repos in job ID
Diffstat (limited to 'src/Command')
| -rw-r--r-- | src/Command/Run.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Command/Run.hs b/src/Command/Run.hs index 0535955..9370eca 100644 --- a/src/Command/Run.hs +++ b/src/Command/Run.hs @@ -134,7 +134,7 @@ argumentJobSource names = do return ( config, Just commit ) cidPart <- case jobsetCommit of - Just commit -> (: []) . JobIdTree . 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 @@ -142,7 +142,7 @@ argumentJobSource names = do Nothing -> tfail $ "job `" <> textJobName name <> "' not found" oneshotJobSource . (: []) =<< cmdEvalWith (\ei -> ei { eiCurrentIdRev = cidPart ++ eiCurrentIdRev ei }) - (evalJobSet JobSet {..}) + (evalJobSet [] JobSet {..}) loadJobSetFromRoot :: (MonadIO m, MonadFail m) => JobRoot -> Commit -> m DeclaredJobSet loadJobSetFromRoot root commit = case root of @@ -160,8 +160,8 @@ rangeSource base tip = do jobsets <- forM commits $ \commit -> do tree <- getCommitTree commit cmdEvalWith (\ei -> ei - { eiCurrentIdRev = JobIdTree (treeId tree) : eiCurrentIdRev ei - }) . evalJobSet =<< loadJobSetFromRoot root commit + { eiCurrentIdRev = JobIdTree Nothing (treeId tree) : eiCurrentIdRev ei + }) . evalJobSet [] =<< loadJobSetFromRoot root commit oneshotJobSource jobsets @@ -183,10 +183,10 @@ watchBranchSource branch = do jobsets <- forM commits $ \commit -> do tree <- getCommitTree commit let einput = einputBase - { eiCurrentIdRev = JobIdTree (treeId tree) : eiCurrentIdRev einputBase + { eiCurrentIdRev = JobIdTree Nothing (treeId tree) : eiCurrentIdRev einputBase } either (fail . T.unpack . textEvalError) return =<< - flip runEval einput . evalJobSet =<< loadJobSetFromRoot root commit + flip runEval einput . evalJobSet [] =<< loadJobSetFromRoot root commit nextvar <- newEmptyTMVarIO atomically $ putTMVar tmvar $ Just ( jobsets, JobSource nextvar ) go cur nextvar @@ -213,10 +213,10 @@ watchTagSource pat = do then do tree <- getCommitTree $ tagObject tag let einput = einputBase - { eiCurrentIdRev = JobIdTree (treeId tree) : eiCurrentIdRev einputBase + { eiCurrentIdRev = JobIdTree Nothing (treeId tree) : eiCurrentIdRev einputBase } jobset <- either (fail . T.unpack . textEvalError) return =<< - flip runEval einput . evalJobSet =<< loadJobSetFromRoot root (tagObject tag) + flip runEval einput . evalJobSet [] =<< loadJobSetFromRoot root (tagObject tag) nextvar <- newEmptyTMVarIO atomically $ putTMVar tmvar $ Just ( [ jobset ], JobSource nextvar ) go nextvar |