Accept literal text block for the ‘shell’ section

Changelog: Accept literal text block for the `shell` section

3 files changed, 22 insertions, 9 deletions

diff --git a/src/Config.hs b/src/Config.hs
index fb3a828..40eb1e5 100644
--- a/src/Config.hs
+++ b/src/Config.hs
@@ -117,18 +117,23 @@ parseSingleCheckout = withMap "checkout definition" $ \m -> do
 parseMultipleCheckouts :: Node Pos -> Parser [ JobCheckout Declared ]
 parseMultipleCheckouts = withSeq "checkout definitions" $ fmap concat . mapM parseSingleCheckout
 
-cabalJob :: Node Pos -> Parser [CreateProcess]
+cabalJob :: Node Pos -> Parser [ Either CreateProcess Text ]
 cabalJob = withMap "cabal job" $ \m -> do
     ghcOptions <- m .:? "ghc-options" >>= \case
         Nothing -> return []
         Just s -> withSeq "GHC option list" (mapM (withStr "GHC option" return)) s
 
     return
-        [ proc "cabal" $ concat [ ["build"], ("--ghc-option="++) . T.unpack <$> ghcOptions ] ]
-
-shellJob :: Node Pos -> Parser [CreateProcess]
-shellJob = withSeq "shell commands" $ \xs -> do
-    fmap (map shell) $ forM xs $ withStr "shell command" $ return . T.unpack
+        [ Left $ proc "cabal" $ concat [ ["build"], ("--ghc-option="++) . T.unpack <$> ghcOptions ] ]
+
+shellJob :: Node Pos -> Parser [ Either CreateProcess Text ]
+shellJob node = do
+    commands <- choice
+        [ withStr "shell commands" return node
+        , withSeq "shell commands" (\xs -> do
+            fmap T.unlines $ forM xs $ withStr "shell command" $ return) node
+        ]
+    return [ Right commands ]
 
 parseArtifacts :: Mapping Pos -> Parser [ ( ArtifactName, Pattern ) ]
 parseArtifacts m = do
diff --git a/src/Job.hs b/src/Job.hs
index 5a22d63..3fe75e6 100644
--- a/src/Job.hs
+++ b/src/Job.hs
@@ -38,6 +38,7 @@ import Data.Text qualified as T
 import Data.Text.IO qualified as T
 
 import System.Directory
+import System.Environment
 import System.Exit
 import System.FilePath
 import System.FilePath.Glob
@@ -424,14 +425,21 @@ runJob job uses checkoutPath jdir = do
         copyRecursive (aoutStorePath aout) target
 
     bracket (liftIO $ openFile (jdir </> "log") WriteMode) (liftIO . hClose) $ \logs -> do
-        forM_ (fromMaybe [] $ jobRecipe job) $ \p -> do
+        forM_ (fromMaybe [] $ jobRecipe job) $ \ep -> do
+            ( p, input ) <- case ep of
+                Left p -> return ( p, "" )
+                Right script -> do
+                    sh <- fromMaybe "/bin/sh" <$> liftIO (lookupEnv "SHELL")
+                    return ( proc sh [], script )
             (Just hin, _, _, hp) <- liftIO $ createProcess_ "" p
                 { cwd = Just checkoutPath
                 , std_in = CreatePipe
                 , std_out = UseHandle logs
                 , std_err = UseHandle logs
                 }
-            liftIO $ hClose hin
+            liftIO $ void $ forkIO $ do
+                T.hPutStr hin input
+                hClose hin
             liftIO (waitForProcess hp) >>= \case
                 ExitSuccess -> return ()
                 ExitFailure n
diff --git a/src/Job/Types.hs b/src/Job/Types.hs
index 5d3f0f3..262a267 100644
--- a/src/Job/Types.hs
+++ b/src/Job/Types.hs
@@ -20,7 +20,7 @@ data Job' d = Job
     { jobId :: JobId' d
     , jobName :: JobName
     , jobCheckout :: [ JobCheckout d ]
-    , jobRecipe :: Maybe [ CreateProcess ]
+    , jobRecipe :: Maybe [ Either CreateProcess Text ]
     , jobArtifacts :: [ ( ArtifactName, Pattern ) ]
     , jobUses :: [ ArtifactSpec ]
     , jobPublish :: [ JobPublish d ]