diff options
| author | Steve Hart <steve@stevehart.net> | 2022-03-25 15:43:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 20:43:50 +0100 |
| commit | 53244da3330ada568f80e2a07b4c6fe7268c91fc (patch) | |
| tree | 5ec71e69855571ea7b89a342e6078ad2a6c289ca /haddock-library | |
| parent | e187816f64f0c54dc924f8283fe4c75a6e1f67b2 (diff) | |
Fix CI (#1467)
* CI: Reinstall GHC with docs
CI tests were failing because the GHC preinstalled to the CI
environment does not include documentation, which is required for
running the Haddock tests. This commit causes the CI workflow to
reinstall GHC with docs so that tests can succeed.
Diffstat (limited to 'haddock-library')
| -rw-r--r-- | haddock-library/haddock-library.cabal | 4 | ||||
| -rw-r--r-- | haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index a4a04309..a02df882 100644 --- a/haddock-library/haddock-library.cabal +++ b/haddock-library/haddock-library.cabal @@ -86,7 +86,7 @@ test-suite spec Documentation.Haddock.Parser.Identifier build-depends: - , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , base-compat ^>= 0.12.0 , QuickCheck ^>= 2.11 || ^>= 2.13.2 || ^>= 2.14 , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 @@ -113,7 +113,7 @@ test-suite fixtures , base -- extra dependencies - , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , base-compat ^>= 0.12.0 , directory ^>= 1.3.0.2 , filepath ^>= 1.4.1.2 , optparse-applicative ^>= 0.15 diff --git a/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs b/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs index 10c701c7..2bb58fdf 100644 --- a/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs +++ b/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} module Documentation.Haddock.Parser.UtilSpec (main, spec) where @@ -5,7 +6,9 @@ import Documentation.Haddock.Parser.Monad import Documentation.Haddock.Parser.Util import Data.Either.Compat (isLeft) import Test.Hspec +#if !(MIN_VERSION_base(4,8,0)) import Control.Applicative +#endif main :: IO () main = hspec spec |