Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
Cabal
Commits
525ef663
Commit
525ef663
authored
5 years ago
by
isovector
Committed by
Oleg Grenrus
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Haddock failures should be fatal when running Haddock
parent
dc138034
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cabal-install/Distribution/Client/CmdHaddock.hs
+1
-1
1 addition, 1 deletion
cabal-install/Distribution/Client/CmdHaddock.hs
cabal-install/Distribution/Client/ProjectOrchestration.hs
+3
-2
3 additions, 2 deletions
cabal-install/Distribution/Client/ProjectOrchestration.hs
with
4 additions
and
3 deletions
cabal-install/Distribution/Client/CmdHaddock.hs
+
1
−
1
View file @
525ef663
...
...
@@ -74,7 +74,7 @@ haddockAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags, TestFl
haddockAction
(
configFlags
,
configExFlags
,
installFlags
,
haddockFlags
,
testFlags
)
targetStrings
globalFlags
=
do
baseCtx
<-
establishProjectBaseContext
verbosity
cliConfig
Other
Command
baseCtx
<-
establishProjectBaseContext
verbosity
cliConfig
Haddock
Command
targetSelectors
<-
either
(
reportTargetSelectorProblems
verbosity
)
return
=<<
readTargetSelectors
(
localPackages
baseCtx
)
Nothing
targetStrings
...
...
This diff is collapsed.
Click to expand it.
cabal-install/Distribution/Client/ProjectOrchestration.hs
+
3
−
2
View file @
525ef663
...
...
@@ -171,7 +171,7 @@ import System.Posix.Signals (sigKILL, sigSEGV)
-- | Tracks what command is being executed, because we need to hide this somewhere
-- for cases that need special handling (usually for error reporting).
data
CurrentCommand
=
InstallCommand
|
OtherCommand
data
CurrentCommand
=
InstallCommand
|
HaddockCommand
|
OtherCommand
deriving
(
Show
,
Eq
)
-- | This holds the context of a project prior to solving: the content of the
...
...
@@ -431,7 +431,7 @@ runProjectPostBuildPhase verbosity
-- Finally if there were any build failures then report them and throw
-- an exception to terminate the program
dieOnBuildFailures
verbosity
currentCommand
elaboratedPlanToExecute
buildOutcomes
dieOnBuildFailures
verbosity
currentCommand
elaboratedPlanToExecute
buildOutcomes
-- Note that it is a deliberate design choice that the 'buildTargets' is
-- not passed to phase 1, and the various bits of input config is not
...
...
@@ -1030,6 +1030,7 @@ dieOnBuildFailures verbosity currentCommand plan buildOutcomes
]
dieIfNotHaddockFailure
|
currentCommand
==
HaddockCommand
=
die'
|
all
isHaddockFailure
failuresClassification
=
warn
|
otherwise
=
die'
where
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment