Fix #5697 Move stack to lts-19.7 (GHC 9.0.2) from lts-17.15 (GHC 8.10.4)

Also seeks to update the tests to use a current stable release GHC compiler. `Stack.Test.runRepl` was not working, apparently because it was referring to a directory (`/tmp`, equivalent to `C:\tmp`) that did not exist. Also updates the scripts to `lts-19.7`. These have been tested with `stack script <script.hs> --no-run --compile --resolver=lts-19.7`. Adds `*.exe` to `.gitignore` (an artefact on Windows of testing scripts). Temporarily alter CI script to try and diagnose the macOS CI problem.
commercialhaskell · May 21, 2022 · bbea19d · bbea19d
1 parent faf89a0
commit bbea19d
Show file tree

Hide file tree

Showing 121 changed files with 176 additions and 144 deletions.
diff --git 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
@@ -1,5 +1,6 @@
 *.hi
 *.o
+*.exe
 *.swp
 *.tag
 *~

diff --git 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
@@ -1,5 +1,5 @@
 {- stack script
-    --resolver lts-14.27
+    --resolver lts-19.7
     --install-ghc
     --package nsis
 -}
@@ -52,7 +52,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
@@ -79,7 +79,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
@@ -1,6 +1,6 @@
 #!/usr/bin/env stack
 {- stack script
-    --resolver lts-14.27
+    --resolver lts-19.7
     --package base
     --package directory
     --package filepath

diff --git 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

diff --git a/stack-ghc-902.yaml b/stack-ghc-902.yaml
@@ -1,5 +1,5 @@
 # GHC 9.0.2
-resolver: lts-19.6
+resolver: lts-19.7
 
 packages:
 - .
@@ -22,9 +22,9 @@ ghc-options:
   "$locals": -fhide-source-paths
 
 extra-deps:
-# mustache absent from lts-19.5
+# mustache absent from lts-19.7
 - mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
-# lts-19.6 is limited to hpack-0.34.7
+# lts-19.7 is limited to hpack-0.34.7
 - hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
 
 drop-packages:

diff --git a/stack.yaml b/stack.yaml
@@ -1,13 +1,14 @@
-resolver: lts-17.15
+# GHC 9.0.2, Cabal-3.4.1.0, pantry-0.5.5 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
-
+# mustache absent from lts-19.7
+- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
+# lts-19.7 is limited to hpack-0.34.7
+- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
 
 docker:
   enable: false
@@ -19,6 +20,7 @@ nix:
   packages:
     - zlib
     - unzip
+
 flags:
   stack:
     developer-mode: true

diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-resolver: lts-14.27
+resolver: lts-19.7
-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     *.hi
     *.o
+    *.exe
     *.swp
     *.tag
     *~
@@ Expand Down @@