Skip to content

GitLab

Commit 6309f825 authored by Duncan Coutts's avatar Duncan Coutts Committed by GitHub
Browse files

Merge pull request #3686 from dcoutts/new-build-exception-handling 

Rework new-build failure reporting to include build logs
parents 715b0380 a9247b15
Hide whitespace changes
Inline Side-by-side
cabal-install/Distribution/Client/BuildReports/Anonymous.hs
View file @ 6309f825
......@@ -27,7 +27,7 @@ module Distribution.Client.BuildReports.Anonymous (
) where
import qualified Distribution.Client.Types as BR
( BuildResult, BuildFailure(..), BuildSuccess(..)
( BuildOutcome, BuildFailure(..), BuildResult(..)
, DocsResult(..), TestsResult(..) )
import Distribution.Client.Utils
( mergeBy, MergeResult(..) )
......@@ -120,7 +120,7 @@ data Outcome = NotTried | Failed | Ok
deriving Eq
new :: OS -> Arch -> CompilerId -> PackageIdentifier -> FlagAssignment
-> [PackageIdentifier] -> BR.BuildResult -> BuildReport
-> [PackageIdentifier] -> BR.BuildOutcome -> BuildReport
new os' arch' comp pkgid flags deps result =
BuildReport {
package = pkgid,
......@@ -145,17 +145,17 @@ new os' arch' comp pkgid flags deps result =
Left (BR.BuildFailed _) -> BuildFailed
Left (BR.TestsFailed _) -> TestsFailed
Left (BR.InstallFailed _) -> InstallFailed
Right (BR.BuildOk _ _ _) -> InstallOk
Right (BR.BuildResult _ _ _) -> InstallOk
convertDocsOutcome = case result of
Left _ -> NotTried
Right (BR.BuildOk BR.DocsNotTried _ _) -> NotTried
Right (BR.BuildOk BR.DocsFailed _ _) -> Failed
Right (BR.BuildOk BR.DocsOk _ _) -> Ok
Left _ -> NotTried
Right (BR.BuildResult BR.DocsNotTried _ _) -> NotTried
Right (BR.BuildResult BR.DocsFailed _ _) -> Failed
Right (BR.BuildResult BR.DocsOk _ _) -> Ok
convertTestsOutcome = case result of
Left (BR.TestsFailed _) -> Failed
Left _ -> NotTried
Right (BR.BuildOk _ BR.TestsNotTried _) -> NotTried
Right (BR.BuildOk _ BR.TestsOk _) -> Ok
Left (BR.TestsFailed _) -> Failed
Left _ -> NotTried
Right (BR.BuildResult _ BR.TestsNotTried _) -> NotTried
Right (BR.BuildResult _ BR.TestsOk _) -> Ok
cabalInstallID :: PackageIdentifier
cabalInstallID =
......
cabal-install/Distribution/Client/BuildReports/Storage.hs
View file @ 6309f825
......@@ -123,19 +123,19 @@ storeLocal cinfo templates reports platform = sequence_
fromInstallPlan :: Platform -> CompilerId
-> InstallPlan
-> BuildResults
-> BuildOutcomes
-> [(BuildReport, Maybe Repo)]
fromInstallPlan platform comp plan buildResults =
fromInstallPlan platform comp plan buildOutcomes =
catMaybes
. map (\pkg -> fromPlanPackage
platform comp pkg
(InstallPlan.lookupBuildResult pkg buildResults))
(InstallPlan.lookupBuildOutcome pkg buildOutcomes))
. InstallPlan.toList
$ plan
fromPlanPackage :: Platform -> CompilerId
-> InstallPlan.PlanPackage
-> Maybe BuildResult
-> Maybe BuildOutcome
-> Maybe (BuildReport, Maybe Repo)
fromPlanPackage (Platform arch os) comp
(InstallPlan.Configured (ConfiguredPackage _ srcPkg flags _ deps))
......
cabal-install/Distribution/Client/CmdBuild.hs
View file @ 6309f825
......@@ -55,7 +55,7 @@ buildAction (configFlags, configExFlags, installFlags, haddockFlags)
unless (buildSettingDryRun buildSettings) $ do
buildResults <- runProjectBuildPhase verbosity buildCtx
reportBuildFailures elaboratedPlan buildResults
reportBuildFailures verbosity elaboratedPlan buildResults
where
verbosity = fromFlagOrDefault normal (configVerbosity configFlags)
......
cabal-install/Distribution/Client/CmdRepl.hs
View file @ 6309f825
......@@ -59,7 +59,7 @@ replAction (configFlags, configExFlags, installFlags, haddockFlags)
unless (buildSettingDryRun buildSettings) $ do
buildResults <- runProjectBuildPhase verbosity buildCtx
reportBuildFailures elaboratedPlan buildResults
reportBuildFailures verbosity elaboratedPlan buildResults
where
verbosity = fromFlagOrDefault normal (configVerbosity configFlags)
......
cabal-install/Distribution/Client/Install.hs
View file @ 6309f825
......@@ -339,9 +339,9 @@ processInstallPlan verbosity
installFlags pkgSpecifiers
unless (dryRun || nothingToInstall) $ do
buildResults <- performInstallations verbosity
args installedPkgIndex installPlan
postInstallActions verbosity args userTargets installPlan buildResults
buildOutcomes <- performInstallations verbosity
args installedPkgIndex installPlan
postInstallActions verbosity args userTargets installPlan buildOutcomes
where
installPlan = InstallPlan.configureInstallPlan installPlan0
dryRun = fromFlag (installDryRun installFlags)
......@@ -808,12 +808,12 @@ postInstallActions :: Verbosity
-> InstallArgs
-> [UserTarget]
-> InstallPlan
-> BuildResults
-> BuildOutcomes
-> IO ()
postInstallActions verbosity
(packageDBs, _, comp, platform, conf, useSandbox, mSandboxPkgInfo
,globalFlags, configFlags, _, installFlags, _)
targets installPlan buildResults = do
targets installPlan buildOutcomes = do
unless oneShot $
World.insert verbosity worldFile
......@@ -822,7 +822,7 @@ postInstallActions verbosity
| UserTargetNamed dep <- targets ]
let buildReports = BuildReports.fromInstallPlan platform (compilerId comp)
installPlan buildResults
installPlan buildOutcomes
BuildReports.storeLocal (compilerInfo comp)
(fromNubList $ installSummaryFile installFlags)
buildReports
......@@ -833,15 +833,15 @@ postInstallActions verbosity
storeDetailedBuildReports verbosity logsDir buildReports
regenerateHaddockIndex verbosity packageDBs comp platform conf useSandbox
configFlags installFlags buildResults
configFlags installFlags buildOutcomes
symlinkBinaries verbosity platform comp configFlags installFlags
installPlan buildResults
installPlan buildOutcomes
printBuildFailures buildResults
printBuildFailures buildOutcomes
updateSandboxTimestampsFile useSandbox mSandboxPkgInfo
comp platform installPlan buildResults
comp platform installPlan buildOutcomes
where
reportingLevel = fromFlag (installBuildReports installFlags)
......@@ -891,10 +891,10 @@ regenerateHaddockIndex :: Verbosity
-> UseSandbox
-> ConfigFlags
-> InstallFlags
-> BuildResults
-> BuildOutcomes
-> IO ()
regenerateHaddockIndex verbosity packageDBs comp platform conf useSandbox
configFlags installFlags buildResults
configFlags installFlags buildOutcomes
| haddockIndexFileIsRequested && shouldRegenerateHaddockIndex = do
defaultDirs <- InstallDirs.defaultInstallDirs
......@@ -922,11 +922,11 @@ regenerateHaddockIndex verbosity packageDBs comp platform conf useSandbox
-- #1337), we don't do it for global installs or special cases where we're
-- installing into a specific db.
shouldRegenerateHaddockIndex = (isUseSandbox useSandbox || normalUserInstall)
&& someDocsWereInstalled buildResults
&& someDocsWereInstalled buildOutcomes
where
someDocsWereInstalled = any installedDocs . Map.elems
installedDocs (Right (BuildOk DocsOk _ _)) = True
installedDocs _ = False
installedDocs (Right (BuildResult DocsOk _ _)) = True
installedDocs _ = False
normalUserInstall = (UserPackageDB `elem` packageDBs)
&& all (not . isSpecificPackageDB) packageDBs
......@@ -951,13 +951,13 @@ symlinkBinaries :: Verbosity
-> ConfigFlags
-> InstallFlags
-> InstallPlan
-> BuildResults
-> BuildOutcomes
-> IO ()
symlinkBinaries verbosity platform comp configFlags installFlags
plan buildResults = do
plan buildOutcomes = do
failed <- InstallSymlink.symlinkBinaries platform comp
configFlags installFlags
plan buildResults
plan buildOutcomes
case failed of
[] -> return ()
[(_, exe, path)] ->
......@@ -979,10 +979,10 @@ symlinkBinaries verbosity platform comp configFlags installFlags
bindir = fromFlag (installSymlinkBinDir installFlags)
printBuildFailures :: BuildResults -> IO ()
printBuildFailures buildResults =
printBuildFailures :: BuildOutcomes -> IO ()
printBuildFailures buildOutcomes =
case [ (pkgid, failure)
| (pkgid, Left failure) <- Map.toList buildResults ] of
| (pkgid, Left failure) <- Map.toList buildOutcomes ] of
[] -> return ()
failed -> die . unlines
$ "Error: some packages failed to install:"
......@@ -1025,16 +1025,16 @@ printBuildFailures buildResults =
updateSandboxTimestampsFile :: UseSandbox -> Maybe SandboxPackageInfo
-> Compiler -> Platform
-> InstallPlan
-> BuildResults
-> BuildOutcomes
-> IO ()
updateSandboxTimestampsFile (UseSandbox sandboxDir)
(Just (SandboxPackageInfo _ _ _ allAddSourceDeps))
comp platform installPlan buildResults =
comp platform installPlan buildOutcomes =
withUpdateTimestamps sandboxDir (compilerId comp) platform $ \_ -> do
let allInstalled = [ pkg
| InstallPlan.Configured pkg
<- InstallPlan.toList installPlan
, case InstallPlan.lookupBuildResult pkg buildResults of
, case InstallPlan.lookupBuildOutcome pkg buildOutcomes of
Just (Right _success) -> True
_ -> False
]
......@@ -1062,7 +1062,7 @@ performInstallations :: Verbosity
-> InstallArgs
-> InstalledPackageIndex
-> InstallPlan
-> IO BuildResults
-> IO BuildOutcomes
performInstallations verbosity
(packageDBs, repoCtxt, comp, platform, conf, useSandbox, _,
globalFlags, configFlags, configExFlags, installFlags, haddockFlags)
......@@ -1170,26 +1170,26 @@ performInstallations verbosity
executeInstallPlan :: Verbosity
-> JobControl IO (UnitId, BuildResult)
-> JobControl IO (UnitId, BuildOutcome)
-> Bool
-> UseLogFile
-> InstallPlan
-> (ReadyPackage -> IO BuildResult)
-> IO BuildResults
-> (ReadyPackage -> IO BuildOutcome)
-> IO BuildOutcomes
executeInstallPlan verbosity jobCtl keepGoing useLogFile plan0 installPkg =
InstallPlan.execute
jobCtl keepGoing depsFailure plan0 $ \pkg -> do
buildResult <- installPkg pkg
printBuildResult (packageId pkg) (installedPackageId pkg) buildResult
return buildResult
buildOutcome <- installPkg pkg
printBuildResult (packageId pkg) (installedPackageId pkg) buildOutcome
return buildOutcome
where
depsFailure = DependentFailed . packageId
-- Print build log if something went wrong, and 'Installed $PKGID'
-- otherwise.
printBuildResult :: PackageId -> UnitId -> BuildResult -> IO ()
printBuildResult pkgid ipid buildResult = case buildResult of
printBuildResult :: PackageId -> UnitId -> BuildOutcome -> IO ()
printBuildResult pkgid ipid buildOutcome = case buildOutcome of
(Right _) -> notice verbosity $ "Installed " ++ display pkgid
(Left _) -> do
notice verbosity $ "Failed to install " ++ display pkgid
......@@ -1252,8 +1252,8 @@ fetchSourcePackage
-> RepoContext
-> JobLimit
-> UnresolvedPkgLoc
-> (ResolvedPkgLoc -> IO BuildResult)
-> IO BuildResult
-> (ResolvedPkgLoc -> IO BuildOutcome)
-> IO BuildOutcome
fetchSourcePackage verbosity repoCtxt fetchLimit src installPkg = do
fetched <- checkFetched src
case fetched of
......@@ -1267,8 +1267,8 @@ fetchSourcePackage verbosity repoCtxt fetchLimit src installPkg = do
installLocalPackage
:: Verbosity
-> PackageIdentifier -> ResolvedPkgLoc -> FilePath
-> (Maybe FilePath -> IO BuildResult)
-> IO BuildResult
-> (Maybe FilePath -> IO BuildOutcome)
-> IO BuildOutcome
installLocalPackage verbosity pkgid location distPref installPkg =
case location of
......@@ -1292,8 +1292,8 @@ installLocalPackage verbosity pkgid location distPref installPkg =
installLocalTarballPackage
:: Verbosity
-> PackageIdentifier -> FilePath -> FilePath
-> (Maybe FilePath -> IO BuildResult)
-> IO BuildResult
-> (Maybe FilePath -> IO BuildOutcome)
-> IO BuildOutcome
installLocalTarballPackage verbosity pkgid
tarballPath distPref installPkg = do
tmp <- getTemporaryDirectory
......@@ -1356,7 +1356,7 @@ installUnpackedPackage
-> PackageDescriptionOverride
-> Maybe FilePath -- ^ Directory to change to before starting the installation.
-> UseLogFile -- ^ File to log output to (if any)
-> IO BuildResult
-> IO BuildOutcome
installUnpackedPackage verbosity installLock numJobs
scriptOptions
configFlags installFlags haddockFlags comp conf
......@@ -1439,7 +1439,7 @@ installUnpackedPackage verbosity installLock numJobs
NoMultiInstance
packageDBs ipkg'
return (Right (BuildOk docsResult testsResult ipkgs'))
return (Right (BuildResult docsResult testsResult ipkgs'))
where
pkgid = packageId pkg
......@@ -1551,14 +1551,14 @@ installUnpackedPackage verbosity installLock numJobs
-- helper
onFailure :: (SomeException -> BuildFailure) -> IO BuildResult -> IO BuildResult
onFailure :: (SomeException -> BuildFailure) -> IO BuildOutcome -> IO BuildOutcome
onFailure result action =
action `catches`
[ Handler $ \ioe -> handler (ioe :: IOException)
, Handler $ \exit -> handler (exit :: ExitCode)
]
where
handler :: Exception e => e -> IO BuildResult
handler :: Exception e => e -> IO BuildOutcome
handler = return . Left . result . toException
......
cabal-install/Distribution/Client/InstallPlan.hs
View file @ 6309f825
......@@ -37,8 +37,8 @@ module Distribution.Client.InstallPlan (
-- * Traversal
executionOrder,
execute,
BuildResults,
lookupBuildResult,
BuildOutcomes,
lookupBuildOutcome,
-- ** Traversal helpers
-- $traversal
Processing,
......@@ -55,7 +55,7 @@ module Distribution.Client.InstallPlan (
reverseDependencyClosure,
) where
import Distribution.Client.Types hiding (BuildResults)
import Distribution.Client.Types hiding (BuildOutcomes)
import qualified Distribution.PackageDescription as PD
import qualified Distribution.Simple.Configure as Configure
import qualified Distribution.Simple.Setup as Cabal
......@@ -704,19 +704,19 @@ executionOrder plan =
-- | The set of results we get from executing an install plan.
--
type BuildResults failure result = Map UnitId (Either failure result)
type BuildOutcomes failure result = Map UnitId (Either failure result)
-- | Lookup the build result for a single package.
--
lookupBuildResult :: HasUnitId pkg
=> pkg -> BuildResults failure result
-> Maybe (Either failure result)
lookupBuildResult = Map.lookup . installedUnitId
lookupBuildOutcome :: HasUnitId pkg
=> pkg -> BuildOutcomes failure result
-> Maybe (Either failure result)
lookupBuildOutcome = Map.lookup . installedUnitId
-- | Execute an install plan. This traverses the plan in dependency order.
--
-- Executing each individual package can fail and if so all dependents fail
-- too. The result for each package is collected as a 'BuildResults' map.
-- too. The result for each package is collected as a 'BuildOutcomes' map.
--
-- Visiting each package happens with optional parallelism, as determined by
-- the 'JobControl'. By default, after any failure we stop as soon as possible
......@@ -732,15 +732,15 @@ execute :: forall m ipkg srcpkg result failure.
-> (srcpkg -> failure) -- ^ Value for dependents of failed packages
-> GenericInstallPlan ipkg srcpkg
-> (GenericReadyPackage srcpkg -> m (Either failure result))
-> m (BuildResults failure result)
-> m (BuildOutcomes failure result)
execute jobCtl keepGoing depFailure plan installPkg =
let (newpkgs, processing) = ready plan
in tryNewTasks Map.empty False False processing newpkgs
where
tryNewTasks :: BuildResults failure result
tryNewTasks :: BuildOutcomes failure result
-> Bool -> Bool -> Processing
-> [GenericReadyPackage srcpkg]
-> m (BuildResults failure result)
-> m (BuildOutcomes failure result)
tryNewTasks !results tasksFailed tasksRemaining !processing newpkgs
-- we were in the process of cancelling and now we're finished
......@@ -767,9 +767,9 @@ execute jobCtl keepGoing depFailure plan installPkg =
| pkg <- newpkgs ]
waitForTasks results tasksFailed processing
waitForTasks :: BuildResults failure result
waitForTasks :: BuildOutcomes failure result
-> Bool -> Processing
-> m (BuildResults failure result)
-> m (BuildOutcomes failure result)
waitForTasks !results tasksFailed !processing = do
(pkgid, result) <- collectJob jobCtl
......
cabal-install/Distribution/Client/InstallSymlink.hs
View file @ 6309f825
......@@ -20,7 +20,7 @@ module Distribution.Client.InstallSymlink (
import Distribution.Package (PackageIdentifier)
import Distribution.Client.InstallPlan (InstallPlan)
import Distribution.Client.Types (BuildResults)
import Distribution.Client.Types (BuildOutcomes)
import Distribution.Client.Setup (InstallFlags)
import Distribution.Simple.Setup (ConfigFlags)
import Distribution.Simple.Compiler
......@@ -30,7 +30,7 @@ symlinkBinaries :: Platform -> Compiler
-> ConfigFlags
-> InstallFlags
-> InstallPlan
-> BuildResults
-> BuildOutcomes
-> IO [(PackageIdentifier, String, FilePath)]
symlinkBinaries _ _ _ _ _ _ = return []
......@@ -40,7 +40,7 @@ symlinkBinary _ _ _ _ = fail "Symlinking feature not available on Windows"
#else
import Distribution.Client.Types
( ConfiguredPackage(..), BuildResults )
( ConfiguredPackage(..), BuildOutcomes )
import Distribution.Client.Setup
( InstallFlags(installSymlinkBinDir) )
import qualified Distribution.Client.InstallPlan as InstallPlan
......@@ -107,9 +107,9 @@ symlinkBinaries :: Platform -> Compiler
-> ConfigFlags
-> InstallFlags
-> InstallPlan
-> BuildResults
-> BuildOutcomes
-> IO [(PackageIdentifier, String, FilePath)]
symlinkBinaries platform comp configFlags installFlags plan buildResults =
symlinkBinaries platform comp configFlags installFlags plan buildOutcomes =
case flagToMaybe (installSymlinkBinDir installFlags) of
Nothing -> return []
Just symlinkBinDir
......@@ -139,7 +139,7 @@ symlinkBinaries platform comp configFlags installFlags plan buildResults =
exes =
[ (cpkg, pkg, exe)
| InstallPlan.Configured cpkg <- InstallPlan.toList plan
, case InstallPlan.lookupBuildResult cpkg buildResults of
, case InstallPlan.lookupBuildOutcome cpkg buildOutcomes of
Just (Right _success) -> True
_ -> False
, let pkg :: PackageDescription
......
cabal-install/Distribution/Client/ProjectBuilding.hs
View file @ 6309f825
......@@ -14,10 +14,11 @@ module Distribution.Client.ProjectBuilding (
rebuildTargetsDryRun,
-- * Build phase
BuildResult,
BuildResults,
BuildOutcome,
BuildOutcomes,
BuildResult(..),
BuildFailure(..),
BuildSuccess(..),
BuildFailureReason(..),
rebuildTargets
) where
......@@ -27,6 +28,8 @@ import Distribution.Client.ProjectConfig
import Distribution.Client.ProjectPlanning
import Distribution.Client.Types
hiding (BuildOutcomes, BuildOutcome,
BuildResult(..), BuildFailure(..))
import Distribution.Client.InstallPlan
( GenericInstallPlan, GenericPlanPackage )
import qualified Distribution.Client.InstallPlan as InstallPlan
......@@ -72,6 +75,7 @@ import Control.Monad
import Control.Exception
import Data.List
import Data.Maybe
import Data.Typeable
import System.FilePath
import System.IO
......@@ -123,8 +127,8 @@ type BuildStatusMap = Map InstalledPackageId BuildStatus
-- | The build status for an individual package is the state that the
-- package is in /prior/ to initiating a (re)build.
--
-- This should not be confused with a 'BuildResult' which is the outcome
-- /after/ building a package.
-- This should not be confused with a 'BuildResult' which is the result
-- /after/ successfully building a package.
--
-- It serves two purposes:
--
......@@ -156,7 +160,7 @@ data BuildStatus =
-- | The package exists in a local dir already, and is fully up to date.
-- So this package can be put into the 'InstallPlan.Installed' state
-- and it does not need to be built.
| BuildStatusUpToDate BuildSuccess
| BuildStatusUpToDate BuildResult
-- | For a package that is going to be built or rebuilt, the state it's in now.
--
......@@ -297,8 +301,8 @@ rebuildTargetsDryRun distDirLayout@DistDirLayout{..} = \installPlan -> do
return (BuildStatusRebuild srcdir rebuild)
-- No changes, the package is up to date. Use the saved build results.
Right buildSuccess ->
return (BuildStatusUpToDate buildSuccess)
Right buildResult ->
return (BuildStatusUpToDate buildResult)
where
packageFileMonitor =
newPackageFileMonitor distDirLayout (packageId pkg)
......@@ -350,7 +354,8 @@ improveInstallPlanWithUpToDatePackages installPlan pkgsBuildStatus =
<- InstallPlan.reverseTopologicalOrder installPlan
, let ipkgid = installedPackageId pkg
Just pkgBuildStatus = Map.lookup ipkgid pkgsBuildStatus
, BuildStatusUpToDate (BuildOk _ _ ipkgs) <- [pkgBuildStatus]
, BuildStatusUpToDate (BuildResult { buildResultLibInfo = ipkgs })
<- [pkgBuildStatus]
]
where
replaceWithPrePreExisting =
......@@ -378,17 +383,17 @@ improveInstallPlanWithUpToDatePackages installPlan pkgsBuildStatus =
--
data PackageFileMonitor = PackageFileMonitor {
pkgFileMonitorConfig :: FileMonitor ElaboratedConfiguredPackage (),
pkgFileMonitorBuild :: FileMonitor (Set ComponentName) BuildSuccessMisc,
pkgFileMonitorBuild :: FileMonitor (Set ComponentName) BuildResultMisc,
pkgFileMonitorReg :: FileMonitor () [InstalledPackageInfo]
}
-- | This is all the components of the 'BuildSuccess' other than the
-- | This is all the components of the 'BuildResult' other than the
-- @['InstalledPackageInfo']@.
--
-- We have to split up the 'BuildSuccess' components since they get produced
-- We have to split up the 'BuildResult' components since they get produced
-- at different times (or rather, when different things change).
--
type BuildSuccessMisc = (DocsResult, TestsResult)
type BuildResultMisc = (DocsResult, TestsResult)
newPackageFileMonitor :: DistDirLayout -> PackageId -> PackageFileMonitor
newPackageFileMonitor DistDirLayout{distPackageCacheFile} pkgid =
......@@ -445,7 +450,7 @@ checkPackageFileMonitorChanged :: PackageFileMonitor
-> ElaboratedConfiguredPackage
-> FilePath
-> ComponentDeps [BuildStatus]
-> IO (Either BuildStatusRebuild BuildSuccess)
-> IO (Either BuildStatusRebuild BuildResult)
checkPackageFileMonitorChanged PackageFileMonitor{..}
pkg srcdir depsBuildStatus = do
--TODO: [nice to have] some debug-level message about file changes, like rerunIfChanged
......@@ -499,10 +504,15 @@ checkPackageFileMonitorChanged PackageFileMonitor{..}
where
buildReason = BuildReasonEphemeralTargets
(MonitorUnchanged buildSuccess _, MonitorUnchanged ipkgs _) ->
return (Right (BuildOk docsResult testsResult ipkgs))
(MonitorUnchanged buildResult _, MonitorUnchanged ipkgs _) ->
return $ Right BuildResult {
buildResultDocs = docsResult,
buildResultTests = testsResult,
buildResultLogFile = Nothing,
buildResultLibInfo = ipkgs
}
where
(docsResult, testsResult) = buildSuccess
(docsResult, testsResult) = buildResult
where
(pkgconfig, buildComponents) = packageFileMonitorKeyValues pkg
changedToMaybe (MonitorChanged _) = Nothing
......@@ -526,14 +536,14 @@ updatePackageBuildFileMonitor :: PackageFileMonitor
-> ElaboratedConfiguredPackage
-> BuildStatusRebuild
-> [FilePath]
-> BuildSuccessMisc
-> BuildResultMisc
-> IO ()
updatePackageBuildFileMonitor PackageFileMonitor{pkgFileMonitorBuild}
srcdir timestamp pkg pkgBuildStatus
allSrcFiles buildSuccess =
allSrcFiles buildResult =
updateFileMonitor pkgFileMonitorBuild srcdir (Just timestamp)
(map monitorFileHashed allSrcFiles)
buildComponents' buildSuccess
buildComponents' buildResult
where
(_pkgconfig, buildComponents) = packageFileMonitorKeyValues pkg
......@@ -568,6 +578,47 @@ invalidatePackageRegFileMonitor PackageFileMonitor{pkgFileMonitorReg} =
-- * Doing it: executing an 'ElaboratedInstallPlan'
------------------------------------------------------------------------------
-- | A summary of the outcome for building a whole set of packages.
--
type BuildOutcomes = Map UnitId BuildOutcome
-- | A summary of the outcome for building a single package: either success
-- or failure.
--
type BuildOutcome = Either BuildFailure BuildResult