diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 07c4ba97e6..045f508682 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -49,6 +49,14 @@ jobs: stack upgrade || curl -sSL https://get.haskellstack.org/ | sh -s - -f + # Report all ghc versions in the stack environment + if [[ "${{ matrix.os }}" == "windows-latest" ]] + then + stack exec -- where.exe ghc + else + stack exec -- which -a ghc + fi + if [[ "${{ matrix.os }}" == "ubuntu-latest" ]] then # Retry installing nix due to nondeterministic error diff --git a/.gitignore b/.gitignore index aff810381c..6b1ff9d363 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.hi *.o +*.exe *.swp *.tag *~ diff --git a/ChangeLog.md b/ChangeLog.md index aafc50e32c..eb550362c3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,6 +5,10 @@ Release notes: +* `stack` is now built with GHC 9.0.2 and depends on `Cabal-3.4.1.0`. This + change will cause a once-off rebuilding of any existing CompilerPaths cache + when the updated `stack` is first used. + **Changes since v2.7.5:** Major changes: diff --git a/etc/scripts/build-stack-installer.hs b/etc/scripts/build-stack-installer.hs index f75d96f4e7..792a8e1522 100644 --- a/etc/scripts/build-stack-installer.hs +++ b/etc/scripts/build-stack-installer.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-14.27 + --resolver lts-19.7 --install-ghc --package nsis -} @@ -53,7 +53,7 @@ main = do [ Description "Add installation directory to user %PATH% to allow running Stack in the console." ] $ do setEnvVarPrepend HKCU "PATH" "$INSTDIR" - + section "Set %STACK_ROOT% to recommended default" [ Description "Set %STACK_ROOT% to C:\\sr to workaround issues with long paths." ] $ do @@ -80,7 +80,7 @@ main = do [ Description "Remove setting of %STACK_ROOT% to C:\\sr." ] $ do deleteEnvVar HKCU "STACK_ROOT" - + section "un.Compilers installed by stack" [ Unselected , Description "Remove %LOCALAPPDATA%/Programs/stack, which contains compilers that have been installed by Stack." diff --git a/etc/scripts/install-many-stack-releases.hs b/etc/scripts/install-many-stack-releases.hs index ab20ed9a5d..32ccccfb83 100755 --- a/etc/scripts/install-many-stack-releases.hs +++ b/etc/scripts/install-many-stack-releases.hs @@ -1,12 +1,13 @@ #!/usr/bin/env stack {- stack script - --resolver lts-14.27 + --resolver lts-19.7 --package base --package directory --package filepath --package process --package safe --package temporary + --extra-dep process-1.6.14.0 -} -- # Usage summary diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 96c96047c1..7299c6700a 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -1,5 +1,5 @@ {- stack script - --resolver lts-14.27 + --resolver lts-19.7 --install-ghc --ghc-options -Wall --package Cabal @@ -21,6 +21,8 @@ --package text --package zip-archive --package zlib + --extra-dep Cabal-3.4.1.0 + --extra-dep proces-1.6.14.0 -} {-# LANGUAGE CPP #-} {-# LANGUAGE RecordWildCards #-} diff --git a/src/Stack/PackageDump.hs b/src/Stack/PackageDump.hs index ad22e0d834..972abfcd55 100644 --- a/src/Stack/PackageDump.hs +++ b/src/Stack/PackageDump.hs @@ -64,7 +64,10 @@ ghcPkgCmdArgs pkgexe@(GhcPkgExe pkgPath) cmd mpkgDbs sink = do case reverse mpkgDbs of (pkgDb:_) -> createDatabase pkgexe pkgDb -- TODO maybe use some retry logic instead? _ -> return () - sinkProcessStdout (toFilePath pkgPath) args sink' + -- Using `sinkProcessStderrStdout` rather than `sinkProcessStdout` because + -- the latter should not be used for long-running processes or ones with + -- lots of output. + snd <$> sinkProcessStderrStdout (toFilePath pkgPath) args CL.sinkNull sink' where args = concat [ case mpkgDbs of diff --git a/stack-ghc-902.yaml b/stack-ghc-902.yaml index b50cca29a8..67351fe3eb 100644 --- a/stack-ghc-902.yaml +++ b/stack-ghc-902.yaml @@ -1,4 +1,4 @@ -# GHC 9.0.2 +# GHC 9.0.2, Cabal-3.4.1.0, pantry-0.5.5, process-1.6.13.2 and rio-0.1.22.0 resolver: lts-19.7 packages: @@ -22,10 +22,14 @@ ghc-options: "$locals": -fhide-source-paths extra-deps: -# mustache absent from lts-19.7 -- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180 +# Required becase a GHC boot package (process) is an extra-dep +- Cabal-3.4.1.0@sha256:48e64c97688149fac15445803830177248f15a9b1a783389efed5e375d70d2d0,31402 # lts-19.7 is limited to hpack-0.34.7 - hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726 +# mustache absent from lts-19.7 +- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180 +# lts-19.7 provides process-1.6.13.2, which excludes certain macOS fixes +- process-1.6.14.0@sha256:b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d,2845 drop-packages: # See https://github.com/commercialhaskell/stack/pull/4712 diff --git a/stack.yaml b/stack.yaml index 1bf4b0db4c..4f57b9c889 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,13 +1,18 @@ -resolver: lts-17.15 +# GHC 9.0.2, Cabal-3.4.1.0, pantry-0.5.5, process-1.6.13.2 and rio-0.1.22.0 +resolver: lts-19.7 packages: - . extra-deps: -- hpack-0.35.0@rev:0 -- pantry-0.5.3@rev:0 -- rio-0.1.21.0@rev:0 - +# Required becase a GHC boot package (process) is an extra-dep +- Cabal-3.4.1.0@sha256:48e64c97688149fac15445803830177248f15a9b1a783389efed5e375d70d2d0,31402 +# lts-19.7 is limited to hpack-0.34.7 +- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726 +# mustache absent from lts-19.7 +- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180 +# lts-19.7 provides process-1.6.13.2, which excludes certain macOS fixes +- process-1.6.14.0@sha256:b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d,2845 docker: enable: false @@ -19,6 +24,7 @@ nix: packages: - zlib - unzip + flags: stack: developer-mode: true diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs index 475694b1dd..3be58c3c22 100644 --- a/test/integration/lib/StackTest.hs +++ b/test/integration/lib/StackTest.hs @@ -7,6 +7,7 @@ import Control.Monad.IO.Class import Control.Monad.Trans.Reader import Control.Concurrent import Control.Exception +import Data.Maybe import System.Environment import System.Directory import System.IO @@ -119,7 +120,12 @@ runRepl cmd args actions = do hSetBuffering rStdout NoBuffering hSetBuffering rStderr NoBuffering - _ <- forkIO $ withFile "/tmp/stderr" WriteMode + tempDir <- if isWindows + then fromMaybe "" <$> lookupEnv "TEMP" + else return "/tmp" + let tempFP = tempDir ++ "/stderr" + + _ <- forkIO $ withFile tempFP WriteMode $ \err -> do hSetBuffering err NoBuffering forever $ catch (hGetChar rStderr >>= hPutChar err) @@ -273,7 +279,7 @@ isMacOSX = os == "darwin" -- the main @stack.yaml@. -- defaultResolverArg :: String -defaultResolverArg = "--resolver=lts-14.27" +defaultResolverArg = "--resolver=lts-19.7" -- | Remove a file and ignore any warnings about missing files. removeFileIgnore :: HasCallStack => FilePath -> IO () diff --git a/test/integration/tests/111-custom-snapshot/Main.hs b/test/integration/tests/111-custom-snapshot/Main.hs index e61b083aa4..24a4d0a237 100644 --- a/test/integration/tests/111-custom-snapshot/Main.hs +++ b/test/integration/tests/111-custom-snapshot/Main.hs @@ -1,4 +1,6 @@ import StackTest main :: IO () -main = stack ["build"] +main = do + stack ["--verbose", "build"] -- More information, to try to diagnose the + -- macos-latest CI problem. diff --git a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml index f365539a82..f0729eb29c 100644 --- a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml +++ b/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-8.6.5 +compiler: ghc-9.0.2 name: my-snapshot packages: - mtl-2.2.1 diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml index f3423ae07d..49b0588e48 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 name: test-snapshot-2 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml index 002d43c0a0..073e6a985b 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 name: snapshot-modify-lts drop-packages: - zlib diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml index 441d9062db..f92b44d54f 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-14.27 +resolver: lts-19.7 name: local-snapshot packages: - archive: package-0.1.2.3.tar.gz diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml index a3f5c11b78..19540460d5 100644 --- a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml +++ b/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml @@ -1,5 +1,5 @@ --- -resolver: lts-14.27 +resolver: lts-19.7 name: remote-snapshot packages: -- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.5.3.tar.gz +- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.7.0.tar.gz diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml index 6716730dfc..0dc36302b7 100644 --- a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml +++ b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1438-configure-options/files/stack-everything.yaml b/test/integration/tests/1438-configure-options/files/stack-everything.yaml index 5469a72a6b..e7c79c5f16 100644 --- a/test/integration/tests/1438-configure-options/files/stack-everything.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-everything.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-locals.yaml b/test/integration/tests/1438-configure-options/files/stack-locals.yaml index f8453ec235..28a9297dea 100644 --- a/test/integration/tests/1438-configure-options/files/stack-locals.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-locals.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-name.yaml b/test/integration/tests/1438-configure-options/files/stack-name.yaml index ae947d8985..93a1bafd2c 100644 --- a/test/integration/tests/1438-configure-options/files/stack-name.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-name.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1438-configure-options/files/stack-targets.yaml b/test/integration/tests/1438-configure-options/files/stack-targets.yaml index 2f2dcdfbf3..dc6da7c269 100644 --- a/test/integration/tests/1438-configure-options/files/stack-targets.yaml +++ b/test/integration/tests/1438-configure-options/files/stack-targets.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - acme-dont-1.1@rev:0 diff --git a/test/integration/tests/1659-skip-component/files/stack.yaml b/test/integration/tests/1659-skip-component/files/stack.yaml index 6716730dfc..0dc36302b7 100644 --- a/test/integration/tests/1659-skip-component/files/stack.yaml +++ b/test/integration/tests/1659-skip-component/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - '.' extra-deps: [] diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml index a9fe2cb1d4..298509440a 100644 --- a/test/integration/tests/1884-url-to-tarball/files/stack.yaml +++ b/test/integration/tests/1884-url-to-tarball/files/stack.yaml @@ -2,4 +2,4 @@ extra-deps: - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c size: 6050 -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/2195-depend-on-exe/files/stack.yaml b/test/integration/tests/2195-depend-on-exe/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/2195-depend-on-exe/files/stack.yaml +++ b/test/integration/tests/2195-depend-on-exe/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/2433-ghc-by-version/files/run.sh b/test/integration/tests/2433-ghc-by-version/files/run.sh index b217e13e39..e5be0e9a01 100755 --- a/test/integration/tests/2433-ghc-by-version/files/run.sh +++ b/test/integration/tests/2433-ghc-by-version/files/run.sh @@ -2,10 +2,10 @@ set -exuo pipefail -export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-8.6.5 --compiler-bin):$PATH +export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.0.2 --compiler-bin):$PATH export STACK_ROOT=$(pwd)/fake-root which ghc -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-8.6.5 ghc -- --info -"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-8.6.5 runghc foo.hs +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.0.2 ghc -- --info +"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.0.2 runghc foo.hs diff --git a/test/integration/tests/2465-init-no-packages/Main.hs b/test/integration/tests/2465-init-no-packages/Main.hs index 0fae42bd2d..38f1589484 100644 --- a/test/integration/tests/2465-init-no-packages/Main.hs +++ b/test/integration/tests/2465-init-no-packages/Main.hs @@ -5,6 +5,6 @@ import Control.Monad (unless) main :: IO () main = do removeFileIgnore "stack.yaml" - stack ["init", "--resolver", "ghc-8.6.5"] + stack ["init", "--resolver", "ghc-9.0.2"] exists <- doesFileExist "stack.yaml" unless exists $ error "stack.yaml not created!" diff --git a/test/integration/tests/2781-shadow-bug/files/stack.yaml b/test/integration/tests/2781-shadow-bug/files/stack.yaml index dc21490bd7..d6f9f2213c 100644 --- a/test/integration/tests/2781-shadow-bug/files/stack.yaml +++ b/test/integration/tests/2781-shadow-bug/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 packages: - foo - bar diff --git a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml index c5aff2469c..115617d9ed 100644 --- a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml +++ b/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 packages: - foo - bar diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml index 6b6b64cc34..d9aea43566 100644 --- a/test/integration/tests/32-unlisted-module/files/stack.yaml +++ b/test/integration/tests/32-unlisted-module/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml index 3732cb9c9f..f6330abf63 100644 --- a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml +++ b/test/integration/tests/3315-multi-ghc-options/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - '.' diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml index 6b6b64cc34..d9aea43566 100644 --- a/test/integration/tests/335-multi-package-flags/files/stack.yaml +++ b/test/integration/tests/335-multi-package-flags/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/3390-unbuildable-test/files/stack.yaml b/test/integration/tests/3390-unbuildable-test/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/3390-unbuildable-test/files/stack.yaml +++ b/test/integration/tests/3390-unbuildable-test/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml index e296386e23..710c709b20 100644 --- a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml +++ b/test/integration/tests/3396-package-indices/files/my-snapshot.yaml @@ -1,4 +1,4 @@ -compiler: ghc-8.6.5 +compiler: ghc-9.0.2 name: my-snapshot packages: @@ -8,4 +8,3 @@ packages: flags: dinamo: debug: true - diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml index 434970fc43..4380cf821a 100644 --- a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml +++ b/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 name: custom1 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml index 781a342f9a..5eef3305da 100644 --- a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml +++ b/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 name: custom2 packages: - stm-2.5.0.0 diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml index 157d1d6c7a..d564d5bf0d 100644 --- a/test/integration/tests/345-override-bytestring/files/stack.yaml +++ b/test/integration/tests/345-override-bytestring/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 extra-deps: - bytestring-0.10.10.0@sha256:06b2e84f1bc9ab71a162c0ca9e88358dd6bbe5cb7fdda2d6d34b6863c367ec95,8944 - binary-0.8.8.0@sha256:e9387a7ef2b34c6a23b09664c306e37cc01ae2cb4e4511a1c96ffb14008c24b0,6262 diff --git a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml index 53e85eadd3..2332eefd16 100644 --- a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml +++ b/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - ./local-mmorph diff --git a/test/integration/tests/3574-extra-dep-local/files/stack.yaml b/test/integration/tests/3574-extra-dep-local/files/stack.yaml index 9359f53127..cf3036ee4e 100644 --- a/test/integration/tests/3574-extra-dep-local/files/stack.yaml +++ b/test/integration/tests/3574-extra-dep-local/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 packages: [] diff --git a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml +++ b/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml index 6b6b64cc34..d9aea43566 100644 --- a/test/integration/tests/365-invalid-success/files/stack.yaml +++ b/test/integration/tests/365-invalid-success/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml index 6b6b64cc34..d9aea43566 100644 --- a/test/integration/tests/366-non-root-dir/files/stack.yaml +++ b/test/integration/tests/366-non-root-dir/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml +++ b/test/integration/tests/370-invalid-setup-hs/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml +++ b/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml index cb2dffab08..2f6e7531c5 100644 --- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml +++ b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 packages: - ./bad-bounds.tar diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml index f5a25a75c7..9644187199 100644 --- a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml +++ b/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - ./bad-bounds.tar diff --git a/test/integration/tests/3863-purge-command/files/stack.yaml b/test/integration/tests/3863-purge-command/files/stack.yaml index 6b6b64cc34..d9aea43566 100644 --- a/test/integration/tests/3863-purge-command/files/stack.yaml +++ b/test/integration/tests/3863-purge-command/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml index 6698e5edf6..3f7ea77b3f 100644 --- a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml +++ b/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml index 6698e5edf6..3f7ea77b3f 100644 --- a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml +++ b/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml index 2bc5fd7a22..ebf3f9e47a 100644 --- a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml +++ b/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml @@ -1,3 +1,3 @@ -resolver: lts-14.27 +resolver: lts-19.7 extra-deps: - base-4.10.1.0 diff --git a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml +++ b/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/3942-solver-error-output/files/test-stack.yml b/test/integration/tests/3942-solver-error-output/files/test-stack.yml index cdfbbf482a..663f867a59 100644 --- a/test/integration/tests/3942-solver-error-output/files/test-stack.yml +++ b/test/integration/tests/3942-solver-error-output/files/test-stack.yml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: [] diff --git a/test/integration/tests/3959-order-of-flags/files/stack.yaml b/test/integration/tests/3959-order-of-flags/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/3959-order-of-flags/files/stack.yaml +++ b/test/integration/tests/3959-order-of-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml +++ b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml index 6698e5edf6..3f7ea77b3f 100644 --- a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml +++ b/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - stm-2.4.4.1 - mtl-2.2.1 diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml index 4a8edf30d1..520f630326 100644 --- a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml +++ b/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml @@ -1 +1 @@ -resolver: lts-15.0 +resolver: lts-19.7 diff --git a/test/integration/tests/4001-excess-recompilation/files/stack.yaml b/test/integration/tests/4001-excess-recompilation/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/4001-excess-recompilation/files/stack.yaml +++ b/test/integration/tests/4001-excess-recompilation/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml index 426711aec1..fdf697bd54 100644 --- a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml +++ b/test/integration/tests/4044-no-run-tests-config/files/stack.yaml @@ -1,4 +1,4 @@ build: test-arguments: no-run-tests: true -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml +++ b/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/4101-dependency-tree/files/stack.yaml b/test/integration/tests/4101-dependency-tree/files/stack.yaml index 17d208d24e..3076c03348 100644 --- a/test/integration/tests/4101-dependency-tree/files/stack.yaml +++ b/test/integration/tests/4101-dependency-tree/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - . - subproject diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml +++ b/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml b/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml index 654a70d662..dfb705d365 100644 --- a/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml +++ b/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml @@ -1,5 +1,5 @@ # Update the resolver as necessary -resolver: ghc-8.22 +resolver: ghc-19.6 # Do not use the system ghc, as ghc must not be available system-ghc: false # Do not install any other ghc, as ghc must not be available diff --git a/test/integration/tests/4215-missing-unregister/files/stack1.yaml b/test/integration/tests/4215-missing-unregister/files/stack1.yaml index 5a7ccc2a25..8e8aa4360b 100644 --- a/test/integration/tests/4215-missing-unregister/files/stack1.yaml +++ b/test/integration/tests/4215-missing-unregister/files/stack1.yaml @@ -1,3 +1,3 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 packages: - v1 diff --git a/test/integration/tests/4215-missing-unregister/files/stack2.yaml b/test/integration/tests/4215-missing-unregister/files/stack2.yaml index b42f9df5c2..aa8ed06217 100644 --- a/test/integration/tests/4215-missing-unregister/files/stack2.yaml +++ b/test/integration/tests/4215-missing-unregister/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 packages: - v2 diff --git a/test/integration/tests/4270-files-order/files/stack.yaml b/test/integration/tests/4270-files-order/files/stack.yaml index a55ce3d6c5..13bbce5e50 100644 --- a/test/integration/tests/4270-files-order/files/stack.yaml +++ b/test/integration/tests/4270-files-order/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - . diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml +++ b/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml +++ b/test/integration/tests/4390-dot-no-ghc/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/4408-init-internal-libs/Main.hs b/test/integration/tests/4408-init-internal-libs/Main.hs index 47d192749a..52cae0e042 100644 --- a/test/integration/tests/4408-init-internal-libs/Main.hs +++ b/test/integration/tests/4408-init-internal-libs/Main.hs @@ -1,4 +1,4 @@ import StackTest main :: IO () -main = stack ["init", "--resolver", "ghc-8.6.5", "--force"] +main = stack ["init", "--resolver", "ghc-9.0.2", "--force"] diff --git a/test/integration/tests/4453-detailed/files/stack.yaml b/test/integration/tests/4453-detailed/files/stack.yaml index 3732cb9c9f..f6330abf63 100644 --- a/test/integration/tests/4453-detailed/files/stack.yaml +++ b/test/integration/tests/4453-detailed/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - '.' diff --git a/test/integration/tests/4488-newer-cabal-version/Main.hs b/test/integration/tests/4488-newer-cabal-version/Main.hs index 4970d2250a..66c697f9a7 100644 --- a/test/integration/tests/4488-newer-cabal-version/Main.hs +++ b/test/integration/tests/4488-newer-cabal-version/Main.hs @@ -2,5 +2,7 @@ import StackTest main :: IO () main = do + stack ["--stack-yaml", "stack-bad.yaml", "setup"] stackErr ["--stack-yaml", "stack-bad.yaml", "build", "--dry-run"] + stack ["--stack-yaml", "stack-good.yaml", "setup"] stack ["--stack-yaml", "stack-good.yaml", "build"] diff --git a/test/integration/tests/4488-newer-cabal-version/files/foo.cabal b/test/integration/tests/4488-newer-cabal-version/files/foo.cabal index 7d7c730aee..54e6396ba9 100644 --- a/test/integration/tests/4488-newer-cabal-version/files/foo.cabal +++ b/test/integration/tests/4488-newer-cabal-version/files/foo.cabal @@ -1,4 +1,4 @@ -cabal-version: 3.0 +cabal-version: 3.4 name: foo version: 0 build-type: Simple diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml index 14f23e9aa6..e9fbcf121d 100644 --- a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml +++ b/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml @@ -1 +1,2 @@ -resolver: ghc-8.6.5 +# Cabal 3.2.1.0 +resolver: ghc-8.10.7 diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml index 6edbd50517..ebfebc5e6d 100644 --- a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml +++ b/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml @@ -1,6 +1,4 @@ -resolver: ghc-8.6.5 +# Cabal 3.2.10 +resolver: ghc-8.10.7 extra-deps: -- Cabal-3.0.0.0@sha256:1ba37b8d80e89213b17db7b8b9ea0108da55ca65f8c0cbb7433881a284c5cf67,26027 -- mtl-2.2.2@sha256:1050fb71acd9f5d67da7d992583f5bd0eb14407b9dc7acc122af1b738b706ca3,2261 -- parsec-3.1.13.0@sha256:d56210cf092db6e43024d9e8871c7e05a8e9e36e9aec09356e5bd401ea8f5a0c,4121 -- text-1.2.3.1@sha256:fc9719142e5cdd6f254b3f4831b133d3fad697ae9b54fe26424f0e023c8cc87d,8539 +- Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459 diff --git a/test/integration/tests/4754-rebuild-haddocks/files/package.yaml b/test/integration/tests/4754-rebuild-haddocks/files/package.yaml index f49c20528e..42a00e8f20 100644 --- a/test/integration/tests/4754-rebuild-haddocks/files/package.yaml +++ b/test/integration/tests/4754-rebuild-haddocks/files/package.yaml @@ -6,3 +6,6 @@ dependencies: library: source-dirs: src + ghc-options: + - -Werror + - -Winvalid-haddock diff --git a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml +++ b/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml index dc0c4c1d21..740344c710 100644 --- a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml +++ b/test/integration/tests/4783-doctest-deps/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 name: foo packages: - acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602 diff --git a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml index 12c3aaca2e..4db32260b9 100644 --- a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml +++ b/test/integration/tests/4897-boot-package-pruned/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: [.] extra-deps: [./directory] diff --git a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml +++ b/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml index 30e82f3a00..af01eacf0d 100644 --- a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml +++ b/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - . diff --git a/test/integration/tests/5272-only-locals/files/stack.yaml b/test/integration/tests/5272-only-locals/files/stack.yaml index 66d5361e8c..67462efeb4 100644 --- a/test/integration/tests/5272-only-locals/files/stack.yaml +++ b/test/integration/tests/5272-only-locals/files/stack.yaml @@ -1,5 +1,5 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: -- unliftio-core-0.1.2.0@rev:2 +- unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082 # Force a unique snapshot - acme-missiles-0.3@rev:0 diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml index 5758329d3e..6ba0f6a5cc 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-17.15 +resolver: lts-19.7 packages: - . - ../package-c diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml index 5758329d3e..6ba0f6a5cc 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-17.15 +resolver: lts-19.7 packages: - . - ../package-c diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml index 913089bf48..f352ecdf74 100644 --- a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml +++ b/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-17.15 +resolver: lts-19.7 packages: - . diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml index 6b6b64cc34..d9aea43566 100644 --- a/test/integration/tests/606-local-version-not-exist/files/stack.yaml +++ b/test/integration/tests/606-local-version-not-exist/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/617-extra-dep-flag/files/stack.yaml b/test/integration/tests/617-extra-dep-flag/files/stack.yaml index 5001bb9140..e8f20c7d12 100644 --- a/test/integration/tests/617-extra-dep-flag/files/stack.yaml +++ b/test/integration/tests/617-extra-dep-flag/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 flags: text: integer-simple: false diff --git a/test/integration/tests/617-unused-flag-cli/files/stack.yaml b/test/integration/tests/617-unused-flag-cli/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/617-unused-flag-cli/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-cli/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml index 2bc41ab366..bdde75ee59 100644 --- a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 flags: files: does-not-exist: false diff --git a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml index 3ed7d2e7d5..a7dc26b75b 100644 --- a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml +++ b/test/integration/tests/617-unused-flag-yaml/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 flags: does-not-exist: foo: false diff --git a/test/integration/tests/620-env-command/files/run.sh b/test/integration/tests/620-env-command/files/run.sh index e13091da30..e585d0f924 100644 --- a/test/integration/tests/620-env-command/files/run.sh +++ b/test/integration/tests/620-env-command/files/run.sh @@ -2,6 +2,6 @@ set -euxo pipefail -stack build --resolver lts-14.27 async -eval `stack config env --resolver lts-14.27` +stack build --resolver lts-19.7 async +eval `stack config env --resolver lts-19.7` ghc Main.hs diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/test/integration/tests/717-sdist-test/files/stack.yaml index 95dc305fa2..d4252757a1 100644 --- a/test/integration/tests/717-sdist-test/files/stack.yaml +++ b/test/integration/tests/717-sdist-test/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - package-with-th - package-with-working-th diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml index 6b6b64cc34..d9aea43566 100644 --- a/test/integration/tests/763-buildable-false/files/stack.yaml +++ b/test/integration/tests/763-buildable-false/files/stack.yaml @@ -2,4 +2,4 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/796-ghc-options/files/stack.yaml b/test/integration/tests/796-ghc-options/files/stack.yaml index bee42c6e9c..e0251e5d0f 100644 --- a/test/integration/tests/796-ghc-options/files/stack.yaml +++ b/test/integration/tests/796-ghc-options/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 ghc-options: "*": -DFOO ghc-options: -DBAR diff --git a/test/integration/tests/build-ghc/Main.hs b/test/integration/tests/build-ghc/Main.hs index d2ca66bda4..da0346f30e 100644 --- a/test/integration/tests/build-ghc/Main.hs +++ b/test/integration/tests/build-ghc/Main.hs @@ -6,7 +6,7 @@ main = superslow $ do -- cleanup previous failing test... removeDirIgnore "tmpPackage" - stack ["new", "--resolver=lts-13.11", "tmpPackage"] + stack ["new", "--resolver=lts-19.7", "tmpPackage"] -- use a commit which is known to succeed with hadrian binary-dist let commitId = "be0dde8e3c27ca56477d1d1801bb77621f3618e1" diff --git a/test/integration/tests/cabal-non-buildable-bug/Main.hs b/test/integration/tests/cabal-non-buildable-bug/Main.hs index a8d9e679c1..e56d0970e4 100644 --- a/test/integration/tests/cabal-non-buildable-bug/Main.hs +++ b/test/integration/tests/cabal-non-buildable-bug/Main.hs @@ -4,7 +4,7 @@ main :: IO () main = do -- Newer Cabal: dry run and building should succeed, because they'll -- both ignore the do-not-build - writeFile "stack.yaml" "resolver: ghc-8.6.5" + writeFile "stack.yaml" "resolver: ghc-9.0.2" stack ["build", "--dry-run"] stack ["build"] diff --git a/test/integration/tests/cabal-public-sublibraries/files/stack.yaml b/test/integration/tests/cabal-public-sublibraries/files/stack.yaml index 724dd5b170..25545477a5 100644 --- a/test/integration/tests/cabal-public-sublibraries/files/stack.yaml +++ b/test/integration/tests/cabal-public-sublibraries/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-01-17 +resolver: nightly-2022-03-17 packages: - . extra-deps: diff --git a/test/integration/tests/cabal-sublibrary-dependency/Main.hs b/test/integration/tests/cabal-sublibrary-dependency/Main.hs index 1fa8ee7d89..a54e2750b3 100644 --- a/test/integration/tests/cabal-sublibrary-dependency/Main.hs +++ b/test/integration/tests/cabal-sublibrary-dependency/Main.hs @@ -4,11 +4,8 @@ import StackTest main :: IO () main = do - putStrLn "Disabled: CI doesn't have GHC 8.8.1" - {- stackErrStderr ["build"] $ \str -> let msg = "SubLibrary dependency is not supported, this will almost certainly fail" in unless (msg `isInfixOf` str) $ error $ "Expected a warning: \n" ++ show msg - -} diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml b/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml index 8b93dddda1..b45343b5f1 100644 --- a/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml +++ b/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-01-17 +resolver: nightly-2022-03-17 packages: - . - subproject diff --git a/test/integration/tests/copy-bins-works/files/stack.yaml b/test/integration/tests/copy-bins-works/files/stack.yaml index 818c8da40f..3cd3e55ba5 100644 --- a/test/integration/tests/copy-bins-works/files/stack.yaml +++ b/test/integration/tests/copy-bins-works/files/stack.yaml @@ -1,2 +1,2 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 copy-bins: true diff --git a/test/integration/tests/cyclic-test-deps/Main.hs b/test/integration/tests/cyclic-test-deps/Main.hs index c602008da2..3635b01c36 100644 --- a/test/integration/tests/cyclic-test-deps/Main.hs +++ b/test/integration/tests/cyclic-test-deps/Main.hs @@ -2,9 +2,9 @@ import StackTest main :: IO () main = do - removeDirIgnore "text-1.2.3.1" - stack ["unpack", "text-1.2.3.1"] - stack ["unpack", "QuickCheck-2.10.1"] + removeDirIgnore "text-2.0" + stack ["unpack", "text-2.0"] + stack ["unpack", "QuickCheck-2.14.2"] removeFileIgnore "stack.yaml" stack ["init", defaultResolverArg] stack ["test", "--dry-run"] diff --git a/test/integration/tests/drop-packages/files/stack.yaml b/test/integration/tests/drop-packages/files/stack.yaml index c34f80a87b..6075e48010 100644 --- a/test/integration/tests/drop-packages/files/stack.yaml +++ b/test/integration/tests/drop-packages/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-14.27 +resolver: lts-19.7 drop-packages: - unliftio-core diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml index d1ea4da297..026ca7484c 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack1.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack1.yaml @@ -1,2 +1,2 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: [] diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml index e2791f810d..6be65ea002 100644 --- a/test/integration/tests/duplicate-package-ids/files/stack2.yaml +++ b/test/integration/tests/duplicate-package-ids/files/stack2.yaml @@ -1,3 +1,3 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - auto-update-0.1.2.1 diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/test/integration/tests/haddock-options/files/stack.yaml index a505b7cda3..f841eb8aa6 100644 --- a/test/integration/tests/haddock-options/files/stack.yaml +++ b/test/integration/tests/haddock-options/files/stack.yaml @@ -2,7 +2,7 @@ flags: {} packages: - '.' extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 build: haddock-arguments: haddock-args: diff --git a/test/integration/tests/hpack-repo/files/stack.yaml b/test/integration/tests/hpack-repo/files/stack.yaml index f321596c45..823528482c 100644 --- a/test/integration/tests/hpack-repo/files/stack.yaml +++ b/test/integration/tests/hpack-repo/files/stack.yaml @@ -1,6 +1,6 @@ packages: - . -resolver: lts-14.27 +resolver: lts-19.7 extra-deps: - git: https://github.com/NorfairKing/validity.git commit: d128cc30bc886e31ea7f8161fb7708c08b162937 diff --git a/test/integration/tests/init-omit-packages/Main.hs b/test/integration/tests/init-omit-packages/Main.hs index ab85b9bb9c..ab42c85dfe 100644 --- a/test/integration/tests/init-omit-packages/Main.hs +++ b/test/integration/tests/init-omit-packages/Main.hs @@ -5,8 +5,8 @@ import System.IO (readFile) main :: IO () main = do removeFileIgnore "stack.yaml" - stackErr ["init", "--resolver", "lts-14.27"] - stack ["init", "--resolver", "lts-14.27", "--omit-packages"] + stackErr ["init", "--resolver", "lts-19.7"] + stack ["init", "--resolver", "lts-19.7", "--omit-packages"] contents <- lines <$> readFile "stack.yaml" unless ("#- bad" `elem` contents) $ error "commented out 'bad' package was expected" diff --git a/test/integration/tests/internal-libraries/Main.hs b/test/integration/tests/internal-libraries/Main.hs index e61b083aa4..0449b0a2e1 100644 --- a/test/integration/tests/internal-libraries/Main.hs +++ b/test/integration/tests/internal-libraries/Main.hs @@ -1,4 +1,6 @@ import StackTest main :: IO () -main = stack ["build"] +main = do + stack ["setup"] -- See stack.yaml; using GHC 8.10.7 + stack ["build"] diff --git a/test/integration/tests/internal-libraries/files/files.cabal b/test/integration/tests/internal-libraries/files/files.cabal index 9391e63a57..30b6c571ce 100644 --- a/test/integration/tests/internal-libraries/files/files.cabal +++ b/test/integration/tests/internal-libraries/files/files.cabal @@ -1,7 +1,7 @@ name: files version: 0.1.0.0 build-type: Simple -cabal-version: >=2.0 +cabal-version: 2.0 library hs-source-dirs: src diff --git a/test/integration/tests/internal-libraries/files/stack.yaml b/test/integration/tests/internal-libraries/files/stack.yaml index 788ec6ae98..6602040ef3 100644 --- a/test/integration/tests/internal-libraries/files/stack.yaml +++ b/test/integration/tests/internal-libraries/files/stack.yaml @@ -1,4 +1,13 @@ -resolver: ghc-8.6.5 -extra-deps: -- stm-2.5.0.0 -- mtl-2.2.1 +# This does not work on Windows with resolver: ghc-9.0.2. It fails with: +# +# Building foreign library 'baz' for files-0.1.0.0.. +# [1 of 1] Compiling Baz [flags changed] +# [1 of 1] Compiling Baz [flags changed] +# Linking .stack-work\dist\d53b6a14\build\baz\baz.dll ... +# //ghc-9.0.2//mingw//bin/ld.exe: cannot find -lHSrts +# collect2.exe: error: ld returned 1 exit status +# `gcc.exe' failed in phase `Linker'. (Exit code: 1) +# +# See https://github.com/haskell/cabal/issues/7763, which includes "Cabal is +# currently unable to build foreign libraries with GHC 9.0 or 9.2." +resolver: ghc-8.10.7 diff --git a/test/integration/tests/lock-files/files/stack-1-extra b/test/integration/tests/lock-files/files/stack-1-extra index 2fb724f00d..0d3b82a800 100644 --- a/test/integration/tests/lock-files/files/stack-1-extra +++ b/test/integration/tests/lock-files/files/stack-1-extra @@ -1,3 +1,3 @@ -resolver: lts-14.27 +resolver: lts-19.7 extra-deps: - acme-cuteboy-0.1.0.0 diff --git a/test/integration/tests/lock-files/files/stack-2-extras b/test/integration/tests/lock-files/files/stack-2-extras index 382e3b0238..9ace37aed1 100644 --- a/test/integration/tests/lock-files/files/stack-2-extras +++ b/test/integration/tests/lock-files/files/stack-2-extras @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 extra-deps: - acme-cuteboy-0.1.0.0 - acme-dont-1.1 diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/test/integration/tests/module-added-multiple-times/files/stack.yaml index 619df55da8..528dfb36f4 100644 --- a/test/integration/tests/module-added-multiple-times/files/stack.yaml +++ b/test/integration/tests/module-added-multiple-times/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 extra-deps: [] flags: {} extra-package-dbs: [] diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml index 067f74ae03..39d744dac1 100644 --- a/test/integration/tests/multi-test/files/stack.yaml +++ b/test/integration/tests/multi-test/files/stack.yaml @@ -4,4 +4,4 @@ packages: - sub-package - cyclic extra-deps: [] -resolver: lts-14.27 +resolver: lts-19.7 diff --git a/test/integration/tests/mutable-deps/files/stack.yaml b/test/integration/tests/mutable-deps/files/stack.yaml index 69cc67d4a1..52a0c0bd19 100644 --- a/test/integration/tests/mutable-deps/files/stack.yaml +++ b/test/integration/tests/mutable-deps/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - . extra-deps: diff --git a/test/integration/tests/nice-resolver-names/Main.hs b/test/integration/tests/nice-resolver-names/Main.hs index 37b842f133..ebebe98339 100644 --- a/test/integration/tests/nice-resolver-names/Main.hs +++ b/test/integration/tests/nice-resolver-names/Main.hs @@ -8,7 +8,7 @@ import Data.List (stripPrefix) main :: IO () main = do - for_ ["lts-14.27", "nightly-2018-01-01"] $ \snapshot -> do + for_ ["lts-19.7", "nightly-2022-03-17"] $ \snapshot -> do stack ["init", "--force", "--resolver", snapshot] str <- readFile "stack.yaml" case mapMaybe (stripPrefix "resolver: ") $ lines str of diff --git a/test/integration/tests/no-rerun-tests/files/stack.yaml b/test/integration/tests/no-rerun-tests/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/no-rerun-tests/files/stack.yaml +++ b/test/integration/tests/no-rerun-tests/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/override-compiler/Main.hs b/test/integration/tests/override-compiler/Main.hs index 3e78436ed4..e2c19c441f 100644 --- a/test/integration/tests/override-compiler/Main.hs +++ b/test/integration/tests/override-compiler/Main.hs @@ -4,4 +4,4 @@ import Control.Monad (unless) main :: IO () main = stackCheckStdout ["exec", "--", "ghc", "--numeric-version"] $ \ver -> -- get rid of the newline character - unless (concat (lines ver) == "8.6.5") $ error $ "Invalid version: " ++ show ver + unless (concat (lines ver) == "9.0.2") $ error $ "Invalid version: " ++ show ver diff --git a/test/integration/tests/override-compiler/files/stack.yaml b/test/integration/tests/override-compiler/files/stack.yaml index 9af4ffcf4e..4472e44db3 100644 --- a/test/integration/tests/override-compiler/files/stack.yaml +++ b/test/integration/tests/override-compiler/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-13.10 -compiler: ghc-8.6.5 +resolver: lts-18.28 +compiler: ghc-9.0.2 packages: [] diff --git a/test/integration/tests/proper-rebuilds/files/stack.yaml b/test/integration/tests/proper-rebuilds/files/stack.yaml index 14f23e9aa6..181b3a2e03 100644 --- a/test/integration/tests/proper-rebuilds/files/stack.yaml +++ b/test/integration/tests/proper-rebuilds/files/stack.yaml @@ -1 +1 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml index a67c7f6af0..9e98e397a2 100644 --- a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml +++ b/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 name: snapshot packages: - acme-missiles-0.3@rev:0 diff --git a/test/integration/tests/script-extra-dep/files/script.hs b/test/integration/tests/script-extra-dep/files/script.hs index d0ec73965b..6c2070df1b 100644 --- a/test/integration/tests/script-extra-dep/files/script.hs +++ b/test/integration/tests/script-extra-dep/files/script.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack --resolver ghc-8.6.5 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.0.0@rev:0 +-- stack --resolver ghc-9.0.2 script --extra-dep acme-missiles-0.3@rev:0 --extra-dep stm-2.5.0.0@rev:0 import Acme.Missiles main :: IO () diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml index 0fc3d73038..e92ede869a 100644 --- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml +++ b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 extra-deps: - async-2.1.1.1 - stm-2.1.2.2 diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml index a2ec7e4f07..b51a9bf527 100644 --- a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml +++ b/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml @@ -1,4 +1,4 @@ -resolver: ghc-8.6.5 +resolver: ghc-9.0.2 name: hackage-revisions-are-annoying packages: - async-2.1.1.1 diff --git a/test/integration/tests/upload/files/stack.yaml b/test/integration/tests/upload/files/stack.yaml index b7044f37cd..da5df448fe 100644 --- a/test/integration/tests/upload/files/stack.yaml +++ b/test/integration/tests/upload/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.27 +resolver: lts-19.7 packages: - . hackage-base-url: http://localhost:12415/ diff --git a/test/integration/tests/watched-files/files/stack.yaml b/test/integration/tests/watched-files/files/stack.yaml index 785b1469c7..520f630326 100644 --- a/test/integration/tests/watched-files/files/stack.yaml +++ b/test/integration/tests/watched-files/files/stack.yaml @@ -1 +1 @@ -resolver: lts-14.27 +resolver: lts-19.7