Update tests to use the correct resolver per stack file.

This commit is contained in:
Alan Zimmerman 2018-06-03 10:55:45 +02:00
parent f8d8bd102e
commit e5a1495c90
2 changed files with 4 additions and 3 deletions

View File

@ -1,5 +1,4 @@
# resolver: nightly-2018-05-30 # last nightly for GHC 8.4.2
resolver: nightly-2018-05-15 # GHC 8.4.2
resolver: nightly-2018-05-30 # last nightly for GHC 8.4.2
packages:
- .
- hie-plugin-api

View File

@ -99,8 +99,10 @@ files =
-- not be able to load the files
readResolver :: IO String
readResolver =
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,2,0)))
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)))
readResolverFrom "stack.yaml"
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,2,0)))
readResolverFrom "stack-8.4.2.yaml"
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)))
readResolverFrom "stack-8.2.2.yaml"
#elif __GLASGOW_HASKELL__ >= 802