From 660e3020f5bbda277278355a861d8e3d6ebeeec8 Mon Sep 17 00:00:00 2001 From: alexwl Date: Wed, 8 May 2019 13:36:33 +0300 Subject: Add support for GHC 8.6.5 --- test/Main.hs | 6 ++++-- test/test-package/stack-8.6.4.yaml | 1 + test/test-package/stack-8.6.5.yaml | 1 + test/test-package/stack.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 test/test-package/stack-8.6.4.yaml create mode 100644 test/test-package/stack-8.6.5.yaml (limited to 'test') diff --git a/test/Main.hs b/test/Main.hs index e4bd4f0..13bbe29 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -155,9 +155,11 @@ moduleInfoSpec modInfo = HCE.idOccMap (modInfo :: HCE.ModuleInfo) `shouldBe` testIdOccMap stackYamlArg :: [String] -#if MIN_VERSION_GLASGOW_HASKELL(8,6,4,0) +#if MIN_VERSION_GLASGOW_HASKELL(8,6,5,0) stackYamlArg = [] -#elif MIN_VERSION_GLASGOW_HASKELL(8,6,1,0) +#elif MIN_VERSION_GLASGOW_HASKELL(8,6,4,0) +stackYamlArg = ["--stack-yaml=stack-8.6.4.yaml"] +#elif MIN_VERSION_GLASGOW_HASKELL(8,6,3,0) stackYamlArg = ["--stack-yaml=stack-8.6.3.yaml"] #elif MIN_VERSION_GLASGOW_HASKELL(8,4,4,0) stackYamlArg = ["--stack-yaml=stack-8.4.4.yaml"] diff --git a/test/test-package/stack-8.6.4.yaml b/test/test-package/stack-8.6.4.yaml new file mode 100644 index 0000000..88f5e2c --- /dev/null +++ b/test/test-package/stack-8.6.4.yaml @@ -0,0 +1 @@ +resolver: lts-13.12 diff --git a/test/test-package/stack-8.6.5.yaml b/test/test-package/stack-8.6.5.yaml new file mode 100644 index 0000000..f9ebe57 --- /dev/null +++ b/test/test-package/stack-8.6.5.yaml @@ -0,0 +1 @@ +resolver: lts-13.20 diff --git a/test/test-package/stack.yaml b/test/test-package/stack.yaml index 88f5e2c..f9ebe57 100644 --- a/test/test-package/stack.yaml +++ b/test/test-package/stack.yaml @@ -1 +1 @@ -resolver: lts-13.12 +resolver: lts-13.20 -- cgit v1.2.3