From f2bed1e29ffe0adf12f1901523c10fef574827c2 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Wed, 11 Oct 2023 09:23:46 +0100 Subject: [PATCH] Re #6286 Skip new GHC setup for test `internal-libraries` --- tests/integration/tests/internal-libraries/Main.hs | 6 +----- tests/integration/tests/internal-libraries/files/stack.yaml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/integration/tests/internal-libraries/Main.hs b/tests/integration/tests/internal-libraries/Main.hs index e1fb82e6cc..e61b083aa4 100644 --- a/tests/integration/tests/internal-libraries/Main.hs +++ b/tests/integration/tests/internal-libraries/Main.hs @@ -1,8 +1,4 @@ import StackTest main :: IO () -main = do - -- The '--install-ghc' flag is passed here, because IntegrationSpec.runApp - -- sets up `config.yaml` with `system-ghc: true` and `install-ghc: false`. - stack ["--install-ghc", "setup"] -- See stack.yaml; using GHC 9.4.7 - stack ["build"] +main = stack ["build"] diff --git a/tests/integration/tests/internal-libraries/files/stack.yaml b/tests/integration/tests/internal-libraries/files/stack.yaml index 59384d9ee3..663b9a584d 100644 --- a/tests/integration/tests/internal-libraries/files/stack.yaml +++ b/tests/integration/tests/internal-libraries/files/stack.yaml @@ -17,4 +17,4 @@ # "Cabal-simple_SvXsv1f__3.2.1.0_ghc-8.10.7: Cannot build some foreign libraries: # Building foreign libraries is currently only supported on OSX, Linux and # Windows" -resolver: ghc-9.4.5 +resolver: ghc-9.4.7