Commit 54ea6949 authored by Valentin Reis's avatar Valentin Reis
Browse files

fix result copy in case of build failure.

parent a854d92c
Pipeline #5880 failed with stages
in 3 minutes and 4 seconds
...@@ -415,13 +415,13 @@ wrap nixCommand target sa@ArgsCommon {..} = do ...@@ -415,13 +415,13 @@ wrap nixCommand target sa@ArgsCommon {..} = do
putText $ nixc <> " " <> T.unwords arglist putText $ nixc <> " " <> T.unwords arglist
case nixCommand of case nixCommand of
NixShell -> executeFile (toS nixc) True (fmap toS arglist) Nothing NixShell -> executeFile (toS nixc) True (fmap toS arglist) Nothing
NixBuild -> NixBuild -> do
P.runProcess_ _ <- P.runProcess
(P.setEnv (fmap (\(x, y) -> (toS x, toS y)) envVars) (P.setEnv (fmap (\(x, y) -> (toS x, toS y)) envVars)
(P.proc (toS nixc) $ fmap toS arglist) (P.proc (toS nixc) $ fmap toS arglist)
) )
<> runProcessVerbose verbosity "cp" ["-r", "/tmp/papa", "./result"] [] runProcessVerbose verbosity "cp" ["-r", "/tmp/papa", "./result"] []
<> runProcessVerbose verbosity "cp" ["-r", toS tmpXDGHOME, "./nixtmpdir"] [] runProcessVerbose verbosity "cp" ["-r", toS tmpXDGHOME, "./nixtmpdir"] []
where where
nixc = toCommand nixCommand nixc = toCommand nixCommand
arglist = arglist =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment