From 364c3cf920ea3ba41af9f8e0a0a6a9efd0edbafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Sun, 13 Apr 2025 19:43:30 +0200 Subject: Use common checkout subdirectory in job ID --- src/Job.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Job.hs') diff --git a/src/Job.hs b/src/Job.hs index beed17d..61ddbb5 100644 --- a/src/Job.hs +++ b/src/Job.hs @@ -291,14 +291,14 @@ prepareJob dir mbCommit job inner = do Just commit -> do tree <- getCommitTree commit forM_ (jobContainingCheckout job) $ \(JobCheckout mbsub dest) -> do - subtree <- maybe return (getSubtree mbCommit) mbsub $ tree + subtree <- maybe return (getSubtree mbCommit . makeRelative (treeSubdir tree)) mbsub $ tree checkoutAt subtree $ checkoutPath fromMaybe "" dest Nothing -> do when (not $ null $ jobContainingCheckout job) $ do fail $ "no containing repository, can't do checkout" forM_ (jobOtherCheckout job) $ \( tree, JobCheckout mbsub dest ) -> do - subtree <- maybe return (getSubtree Nothing) mbsub $ tree + subtree <- maybe return (getSubtree Nothing . makeRelative (treeSubdir tree)) mbsub $ tree checkoutAt subtree $ checkoutPath fromMaybe "" dest let JobId jidParts = jobId job -- cgit v1.2.3