From 875ddfe8c9c42861d9c8876b14b95e05b4ae0fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Tue, 18 Mar 2025 22:12:58 +0100
Subject: Accept glob pattern for artifact path

---
 src/Job.hs | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'src/Job.hs')

diff --git a/src/Job.hs b/src/Job.hs
index 4b20c0e..f147421 100644
--- a/src/Job.hs
+++ b/src/Job.hs
@@ -31,6 +31,7 @@ import Data.Text.IO qualified as T
 import System.Directory
 import System.Exit
 import System.FilePath
+import System.FilePath.Glob
 import System.IO
 import System.IO.Temp
 import System.Posix.Signals
@@ -330,19 +331,26 @@ runJob job uses checkoutPath jdir = do
                     | fromIntegral n == -sigINT -> throwError JobCancelled
                     | otherwise -> throwError JobFailed
 
-    let adir = jdir </> "artifacts"
-    artifacts <- forM (jobArtifacts job) $ \(name@(ArtifactName tname), pathCmd) -> liftIO $ do
-        [path] <- lines <$> readCreateProcess pathCmd { cwd = Just checkoutPath } ""
-        let target = adir </> T.unpack tname
-        createDirectoryIfMissing True adir
-        copyFile (checkoutPath </> path) target
-        return $ ArtifactOutput
-            { aoutName = name
-            , aoutWorkPath = path
-            , aoutStorePath = target
-            }
+        let adir = jdir </> "artifacts"
+        artifacts <- forM (jobArtifacts job) $ \( name@(ArtifactName tname), pathPattern ) -> do
+            path <- liftIO (globDir1 pathPattern checkoutPath) >>= \case
+                [ path ] -> return path
+                found -> do
+                    liftIO $ hPutStrLn logs $
+                        (if null found then "no file" else "multiple files") <> " found matching pattern `" <>
+                        decompile pathPattern <> "' for artifact `" <> T.unpack tname <> "'"
+                    throwError JobFailed
+            let target = adir </> T.unpack tname </> takeFileName path
+            liftIO $ do
+                createDirectoryIfMissing True $ takeDirectory target
+                copyFile (checkoutPath </> path) target
+            return $ ArtifactOutput
+                { aoutName = name
+                , aoutWorkPath = path
+                , aoutStorePath = target
+                }
 
-    return JobOutput
-        { outName = jobName job
-        , outArtifacts = artifacts
-        }
+        return JobOutput
+            { outName = jobName job
+            , outArtifacts = artifacts
+            }
-- 
cgit v1.2.3