diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs index f34f538488..5c360fd1b2 100644 --- a/test/integration/lib/StackTest.hs +++ b/test/integration/lib/StackTest.hs @@ -205,11 +205,10 @@ isMacOSX = os == "darwin" -- | To avoid problems with GHC version mismatch when a new LTS major -- version is released, pass this argument to @stack@ when running in -- a global context. The LTS major version here should match that of --- the main @stack.yaml@ (and ordinarily be the `.0` minor version). +-- the main @stack.yaml@. -- --- NOTE: currently using lts-8.22 instead of lts-8.0 because the `cyclic-test-deps` integration test is broken with lts-8.0 because a hackage metadata revision invalidated the snapshot (snapshot has `test-framework-quickcheck2-0.3.0.3` and `QuickCheck-2.9.2`, which used to be fine, but now test-framework-quickcheck2 was revised to have a `QuickCheck < 2.8` constraint). defaultResolverArg :: String -defaultResolverArg = "--resolver=lts-8.22" +defaultResolverArg = "--resolver=lts-9.14" -- | Remove a file and ignore any warnings about missing files. removeFileIgnore :: FilePath -> IO () diff --git a/test/integration/tests/444-package-option/Main.hs b/test/integration/tests/444-package-option/Main.hs index 5482cc0818..1ecb9f564d 100644 --- a/test/integration/tests/444-package-option/Main.hs +++ b/test/integration/tests/444-package-option/Main.hs @@ -5,4 +5,4 @@ main = do isAlpine <- getIsAlpine if isAlpine || isARM then logInfo "Disabled on Alpine Linux and ARM since it cannot yet install its own GHC." - else stack ["--install-ghc", "runghc", "--package", "safe", "Test.hs"] + else stack [defaultResolverArg, "--install-ghc", "runghc", "--package", "safe", "Test.hs"]