Skip to content

Commit bbea19d

Browse files
committed
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.
1 parent faf89a0 commit bbea19d

File tree

121 files changed

+176
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+176
-144
lines changed

.github/workflows/integration-tests.yml

+8
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ jobs:
4949
5050
stack upgrade || curl -sSL https://get.haskellstack.org/ | sh -s - -f
5151
52+
# Report all ghc versions in the stack environment
53+
if [[ "${{ matrix.os }}" == "windows-latest" ]]
54+
then
55+
stack exec -- where.exe ghc
56+
else
57+
stack exec -- which -a ghc
58+
fi
59+
5260
if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]
5361
then
5462
# Retry installing nix due to nondeterministic error

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.hi
22
*.o
3+
*.exe
34
*.swp
45
*.tag
56
*~

ChangeLog.md

+4

etc/scripts/build-stack-installer.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{- stack script
2-
--resolver lts-14.27
2+
--resolver lts-19.7
33
--install-ghc
44
--package nsis
55
-}
@@ -52,7 +52,7 @@ main = do
5252
[ Description "Add installation directory to user %PATH% to allow running Stack in the console."
5353
] $ do
5454
setEnvVarPrepend HKCU "PATH" "$INSTDIR"
55-
55+
5656
section "Set %STACK_ROOT% to recommended default"
5757
[ Description "Set %STACK_ROOT% to C:\\sr to workaround issues with long paths."
5858
] $ do
@@ -79,7 +79,7 @@ main = do
7979
[ Description "Remove setting of %STACK_ROOT% to C:\\sr."
8080
] $ do
8181
deleteEnvVar HKCU "STACK_ROOT"
82-
82+
8383
section "un.Compilers installed by stack"
8484
[ Unselected
8585
, Description "Remove %LOCALAPPDATA%/Programs/stack, which contains compilers that have been installed by Stack."

etc/scripts/install-many-stack-releases.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env stack
22
{- stack script
3-
--resolver lts-14.27
3+
--resolver lts-19.7
44
--package base
55
--package directory
66
--package filepath

etc/scripts/release.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{- stack script
2-
--resolver lts-14.27
2+
--resolver lts-19.7
33
--install-ghc
44
--ghc-options -Wall
55
--package Cabal

stack-ghc-902.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GHC 9.0.2
2-
resolver: lts-19.6
2+
resolver: lts-19.7
33

44
packages:
55
- .
@@ -22,9 +22,9 @@ ghc-options:
2222
"$locals": -fhide-source-paths
2323

2424
extra-deps:
25-
# mustache absent from lts-19.5
25+
# mustache absent from lts-19.7
2626
- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
27-
# lts-19.6 is limited to hpack-0.34.7
27+
# lts-19.7 is limited to hpack-0.34.7
2828
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
2929

3030
drop-packages:

stack.yaml

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
resolver: lts-17.15
1+
# GHC 9.0.2, Cabal-3.4.1.0, pantry-0.5.5 and rio-0.1.22.0
2+
resolver: lts-19.7
23

34
packages:
45
- .
56

67
extra-deps:
7-
- hpack-0.35.0@rev:0
8-
- pantry-0.5.3@rev:0
9-
- rio-0.1.21.0@rev:0
10-
8+
# mustache absent from lts-19.7
9+
- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
10+
# lts-19.7 is limited to hpack-0.34.7
11+
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
1112

1213
docker:
1314
enable: false
@@ -19,6 +20,7 @@ nix:
1920
packages:
2021
- zlib
2122
- unzip
23+
2224
flags:
2325
stack:
2426
developer-mode: true

test/integration/lib/StackTest.hs

+8-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Control.Monad.IO.Class
77
import Control.Monad.Trans.Reader
88
import Control.Concurrent
99
import Control.Exception
10+
import Data.Maybe
1011
import System.Environment
1112
import System.Directory
1213
import System.IO
@@ -119,7 +120,12 @@ runRepl cmd args actions = do
119120
hSetBuffering rStdout NoBuffering
120121
hSetBuffering rStderr NoBuffering
121122

122-
_ <- forkIO $ withFile "/tmp/stderr" WriteMode
123+
tempDir <- if isWindows
124+
then fromMaybe "" <$> lookupEnv "TEMP"
125+
else return "/tmp"
126+
let tempFP = tempDir ++ "/stderr"
127+
128+
_ <- forkIO $ withFile tempFP WriteMode
123129
$ \err -> do
124130
hSetBuffering err NoBuffering
125131
forever $ catch (hGetChar rStderr >>= hPutChar err)
@@ -273,7 +279,7 @@ isMacOSX = os == "darwin"
273279
-- the main @stack.yaml@.
274280
--
275281
defaultResolverArg :: String
276-
defaultResolverArg = "--resolver=lts-14.27"
282+
defaultResolverArg = "--resolver=lts-19.7"
277283

278284
-- | Remove a file and ignore any warnings about missing files.
279285
removeFileIgnore :: HasCallStack => FilePath -> IO ()
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
compiler: ghc-8.6.5
1+
compiler: ghc-9.0.2
22
name: my-snapshot
33
packages:
44
- mtl-2.2.1

test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
name: test-snapshot-2
33
packages:
44
- stm-2.5.0.0
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22
name: snapshot-modify-lts
33
drop-packages:
44
- zlib
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
resolver: lts-14.27
2+
resolver: lts-19.7
33
name: local-snapshot
44
packages:
55
- archive: package-0.1.2.3.tar.gz
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
resolver: lts-14.27
2+
resolver: lts-19.7
33
name: remote-snapshot
44
packages:
5-
- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.5.3.tar.gz
5+
- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.7.0.tar.gz

test/integration/tests/1337-unicode-everywhere/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22
packages:
33
- '.'
44
extra-deps: []

test/integration/tests/1438-configure-options/files/stack-everything.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22

33
extra-deps:
44
- acme-dont-1.1@rev:0

test/integration/tests/1438-configure-options/files/stack-locals.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22

33
extra-deps:
44
- acme-dont-1.1@rev:0

test/integration/tests/1438-configure-options/files/stack-name.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22

33
extra-deps:
44
- acme-dont-1.1@rev:0

test/integration/tests/1438-configure-options/files/stack-targets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22

33
extra-deps:
44
- acme-dont-1.1@rev:0

test/integration/tests/1659-skip-component/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22
packages:
33
- '.'
44
extra-deps: []

test/integration/tests/1884-url-to-tarball/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ extra-deps:
22
- location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz
33
sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c
44
size: 6050
5-
resolver: lts-14.27
5+
resolver: lts-19.7
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7

test/integration/tests/2433-ghc-by-version/files/run.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
set -exuo pipefail
44

5-
export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-8.6.5 --compiler-bin):$PATH
5+
export PATH=$(pwd)/fake-path:$("$STACK_EXE" path --resolver ghc-9.0.2 --compiler-bin):$PATH
66
export STACK_ROOT=$(pwd)/fake-root
77

88
which ghc
99

10-
"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-8.6.5 ghc -- --info
11-
"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-8.6.5 runghc foo.hs
10+
"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.0.2 ghc -- --info
11+
"$STACK_EXE" --system-ghc --no-install-ghc --resolver ghc-9.0.2 runghc foo.hs

test/integration/tests/2465-init-no-packages/Main.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import Control.Monad (unless)
55
main :: IO ()
66
main = do
77
removeFileIgnore "stack.yaml"
8-
stack ["init", "--resolver", "ghc-8.6.5"]
8+
stack ["init", "--resolver", "ghc-9.0.2"]
99
exists <- doesFileExist "stack.yaml"
1010
unless exists $ error "stack.yaml not created!"
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
packages:
33
- foo
44
- bar

test/integration/tests/2997-ensure-warnings-output/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
packages:
33
- foo
44
- bar

test/integration/tests/32-unlisted-module/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flags: {}
22
packages:
33
- '.'
44
extra-deps: []
5-
resolver: lts-14.27
5+
resolver: lts-19.7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22
packages:
33
- '.'

test/integration/tests/335-multi-package-flags/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flags: {}
22
packages:
33
- '.'
44
extra-deps: []
5-
resolver: lts-14.27
5+
resolver: lts-19.7
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
compiler: ghc-8.6.5
1+
compiler: ghc-9.0.2
22
name: my-snapshot
33

44
packages:
@@ -8,4 +8,3 @@ packages:
88
flags:
99
dinamo:
1010
debug: true
11-

test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
name: custom1
33
packages:
44
- stm-2.5.0.0

test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
name: custom2
33
packages:
44
- stm-2.5.0.0

test/integration/tests/345-override-bytestring/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22
extra-deps:
33
- bytestring-0.10.10.0@sha256:06b2e84f1bc9ab71a162c0ca9e88358dd6bbe5cb7fdda2d6d34b6863c367ec95,8944
44
- binary-0.8.8.0@sha256:e9387a7ef2b34c6a23b09664c306e37cc01ae2cb4e4511a1c96ffb14008c24b0,6262

test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22

33
packages:
44
- ./local-mmorph

test/integration/tests/3574-extra-dep-local/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22

33
packages: []
44

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7

test/integration/tests/365-invalid-success/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flags: {}
22
packages:
33
- '.'
44
extra-deps: []
5-
resolver: lts-14.27
5+
resolver: lts-19.7

test/integration/tests/366-non-root-dir/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flags: {}
22
packages:
33
- '.'
44
extra-deps: []
5-
resolver: lts-14.27
5+
resolver: lts-19.7
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7

test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
packages:
33
- ./bad-bounds.tar
44

test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
extra-deps:
33
- ./bad-bounds.tar
44

test/integration/tests/3863-purge-command/files/stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flags: {}
22
packages:
33
- '.'
44
extra-deps: []
5-
resolver: lts-14.27
5+
resolver: lts-19.7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
extra-deps:
33
- stm-2.4.4.1
44
- mtl-2.2.1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: ghc-8.6.5
1+
resolver: ghc-9.0.2
22
extra-deps:
33
- stm-2.4.4.1
44
- mtl-2.2.1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22
extra-deps:
33
- base-4.10.1.0
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7

test/integration/tests/3942-solver-error-output/files/test-stack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
22

33
packages: []
44

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
resolver: lts-14.27
1+
resolver: lts-19.7

0 commit comments

Comments
 (0)