Skip to content

Commit

Permalink
Fix benchmark build errors
Browse files Browse the repository at this point in the history
9.2.5 and 8.10.7 had build errors when running benchmarks due to `mfsolve`
test suite having duplicate instances, so stop building tests for
mfsolve (see: kuribas/mfsolve#8). Also,
`http2-4.0.0` has a parse error due to a misplaced haddock comment that
causes build failure with `-haddock`. It is fixed in the latest commit
of the source repo, so use that in the `cabal.project` for now.
  • Loading branch information
FinleyMcIlwaine committed Feb 22, 2023
1 parent 9d45637 commit 2073200
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
13 changes: 13 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ optional-packages: vendored/*/*.cabal

tests: True

-- mfsolve has duplicate instances in its test suite
-- See: https://github.com/kuribas/mfsolve/issues/8
package mfsolve
tests: False

if impl(ghc >= 9.5)
source-repository-package
type:git
Expand All @@ -65,6 +70,14 @@ if impl(ghc >= 9.5)
location: https://github.com/wz1000/ghc-exactprint/
tag: 58d88820399b66304f3bb18f0b2602c3a90d5bea

-- Remove when fix for
-- https://github.com/kazu-yamamoto/http2/issues/42
-- is released on hackage
source-repository-package
type:git
location: https://github.com/kazu-yamamoto/http2
tag: aa56ded3494dd4f0efb0bbcb5378879ce785a647

package *
ghc-options: -haddock
test-show-details: direct
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ timed out name op = do
_ <- out name (showDuration secs)
return r

-- |Log using hie logger, reports source position of logging statement
-- | Log using hie logger, reports source position of logging statement
logWith :: (HasCallStack, MonadIO m, Show a1, Show a2) => IdeState -> a1 -> a2 -> m ()
logWith state key val =
liftIO . logPriority (ideLogger state) logLevel $
Expand Down

0 comments on commit 2073200

Please sign in to comment.