Skip to content

Commit 9786cd7

Browse files
committed
Fix benchmark target project setup
1 parent e9530c2 commit 9786cd7

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

ghcide-bench/src/Experiments.hs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -708,12 +708,11 @@ setup = do
708708
package = packageName <> "-" <> showVersion packageVersion
709709
hieYamlPath = path </> "hie.yaml"
710710
alreadySetup <- doesDirectoryExist path
711-
unless alreadySetup $
712-
case buildTool ?config of
711+
case buildTool ?config of
713712
Cabal -> do
714713
let cabalVerbosity = "-v" ++ show (fromEnum (verbose ?config))
715-
callCommandLogging $ "cabal get " <> cabalVerbosity <> " " <> package <> " -d " <> examplesPath
716-
let hieYamlPath = path </> "hie.yaml"
714+
unless alreadySetup $
715+
callCommandLogging $ "cabal get " <> cabalVerbosity <> " " <> package <> " -d " <> examplesPath
717716
writeFile hieYamlPath simpleCabalCradleContent
718717
-- Need this in case there is a parent cabal.project somewhere
719718
writeFile
@@ -722,7 +721,7 @@ setup = do
722721
writeFile
723722
(path </> "cabal.project.local")
724723
""
725-
Stack -> do
724+
Stack -> unless alreadySetup $ do
726725
let stackVerbosity = case verbosity ?config of
727726
Quiet -> "--silent"
728727
Normal -> ""
@@ -780,8 +779,7 @@ cabalProjectForPackage :: ExamplePackage -> String
780779
cabalProjectForPackage ExamplePackage{packageName = "lsp-types"} =
781780
unlines
782781
[ "packages: ."
783-
, "if impl(ghc >= 9.14)"
784-
, " allow-newer: boring:base"
782+
, "allow-newer: boring:base"
785783
]
786784
cabalProjectForPackage _ =
787785
"packages: ."

0 commit comments

Comments
 (0)