GHC 8.8.4 & 8.10.2 (#751)

* GHC 8.8.4 & 8.10.2

* plugins test fixed on 8.10.2

* use GHC 8.10.1 on windows to workaround a bug
This commit is contained in:
Domen Kožar 2020-09-07 18:07:56 +02:00 committed by GitHub
parent 684be6885d
commit 0b34b1ee6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 12 deletions

View File

@ -6,7 +6,7 @@ jobs:
strategy:
matrix:
stack_810:
STACK_YAML: "stack810.yaml"
STACK_YAML: "stack8101.yaml"
stack_88:
STACK_YAML: "stack88.yaml"
stack_86:

View File

@ -1,4 +1,4 @@
resolver: nightly-2020-06-19
resolver: nightly-2020-09-02
allow-newer: true
packages:
- .

32
stack8101.yaml Normal file
View File

@ -0,0 +1,32 @@
resolver: nightly-2020-06-19
allow-newer: true
packages:
- .
extra-deps:
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- lsp-test-0.11.0.2
- ghc-check-0.5.0.1
- hie-bios-0.6.1
# not yet in stackage
- Chart-diagrams-1.9.3
- SVGFonts-1.7.0.1
- diagrams-1.4
- diagrams-svg-1.4.3
- diagrams-contrib-1.4.4
- diagrams-core-1.4.2
- diagrams-lib-1.4.3
- diagrams-postscript-1.5
- monoid-extras-0.5.1
- svg-builder-0.1.1
- active-0.2.0.14
- dual-tree-0.2.2.1
- force-layout-0.4.0.6
- statestack-0.3
nix:
packages: [zlib]
ghc-options:
ghcide: -DSTACK

View File

@ -1,4 +1,4 @@
resolver: nightly-2020-02-13
resolver: lts-16.12
packages:
- .
extra-deps:

View File

@ -2234,8 +2234,7 @@ checkFileCompiles fp =
pluginTests :: TestTree
pluginTests = (`xfail8101` "known broken (#556)")
$ testSessionWait "plugins" $ do
pluginTests = testSessionWait "plugins" $ do
let content =
T.unlines
[ "{-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}"
@ -2716,13 +2715,6 @@ pattern R x y x' y' = Range (Position x y) (Position x' y')
xfail :: TestTree -> String -> TestTree
xfail = flip expectFailBecause
xfail8101 :: TestTree -> String -> TestTree
#if MIN_GHC_API_VERSION(8,10,0)
xfail8101 = flip expectFailBecause
#else
xfail8101 t _ = t
#endif
expectFailCabal :: String -> TestTree -> TestTree
#ifdef STACK
expectFailCabal _ = id