From 33c5f8eaa547c198d12c017f51ac03ed605f560d Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Sun, 26 Jan 2020 14:59:20 +0000 Subject: [PATCH 1/7] Add 8.8.2 stack file and CI --- .circleci/config.yml | 12 ++++++++++++ stack-8.8.2.yaml | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 stack-8.8.2.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index bd3312b1a..6570a80e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,6 +126,16 @@ jobs: - STACK_FILE: "stack-8.6.5.yaml" <<: *defaults + ghc-8.8.1: + environment: + - STACK_FILE: "stack-8.8.1.yaml" + <<: *defaults + + ghc-8.8.2: + environment: + - STACK_FILE: "stack-8.8.2.yaml" + <<: *defaults + ghc-nightly: environment: - STACK_FILE: "stack.yaml" @@ -171,5 +181,7 @@ workflows: - ghc-8.4.4 - ghc-8.6.4 - ghc-8.6.5 + - ghc-8.8.1 + - ghc-8.8.2 - ghc-nightly - cabal diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml new file mode 100644 index 000000000..f2e07f962 --- /dev/null +++ b/stack-8.8.2.yaml @@ -0,0 +1,43 @@ +resolver: nightly-2020-01-25 +packages: +- . +- hie-plugin-api + +extra-deps: +# - ./submodules/HaRe + +- apply-refact-0.7.0.0 +- bytestring-trie-0.2.5.0 +- cabal-helper-1.0.0.0 +- clock-0.7.2 +- constrained-dynamic-0.1.0.0 +- floskell-0.10.2 +- ghc-lib-parser-ex-8.8.2 +- git: https://github.com/haskell/haddock.git + commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 + subdirs: + - haddock-api +- haddock-library-1.8.0 +- haskell-src-exts-1.21.1 +- hie-bios-0.3.2 +- hlint-2.2.8 +- hoogle-5.0.17.11 +- hsimport-0.11.0 +- ilist-0.3.1.0 +- monad-dijkstra-0.1.1.2 +- ormolu-0.0.3.1 +- semigroups-0.18.5 +- temporary-1.2.1.1 + +flags: + haskell-ide-engine: + pedantic: true + hie-plugin-api: + pedantic: true + +# allow-newer: true + +nix: + packages: [ icu libcxx zlib ] + +concurrent-tests: false From 9969d153ba0232d0df2515df55f78e9f28a1751b Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 27 Jan 2020 10:15:58 +0100 Subject: [PATCH 2/7] Add ghc-8.8.2 to azure ci --- .azure/linux-stack.yml | 2 ++ .azure/macos-stack.yml | 2 ++ .azure/windows-stack.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml index e8b3e236d..d437dfe82 100644 --- a/.azure/linux-stack.yml +++ b/.azure/linux-stack.yml @@ -7,6 +7,8 @@ jobs: matrix: stack-def: YAML_FILE: stack.yaml + stack-8.8.2: + YAML_FILE: stack-8.8.2.yaml stack-8.8.1: YAML_FILE: stack-8.8.1.yaml stack-8.6.5: diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml index 0f88e67c5..8fe91eb96 100644 --- a/.azure/macos-stack.yml +++ b/.azure/macos-stack.yml @@ -7,6 +7,8 @@ jobs: matrix: stack-def: YAML_FILE: stack.yaml + stack-8.8.2: + YAML_FILE: stack-8.8.2.yaml stack-8.8.1: YAML_FILE: stack-8.8.1.yaml stack-8.6.5: diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml index b54adb522..6b2aff540 100644 --- a/.azure/windows-stack.yml +++ b/.azure/windows-stack.yml @@ -7,6 +7,8 @@ jobs: matrix: stack-def: YAML_FILE: stack.yaml + stack-8.8.2: + YAML_FILE: stack-8.6.5.yaml stack-8.6.5: YAML_FILE: stack-8.6.5.yaml stack-8.6.4: From 997abbb0a82483fdec6487b10abef2e653c83da1 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 27 Jan 2020 10:18:51 +0100 Subject: [PATCH 3/7] Correct yaml file in win+stack --- .azure/windows-stack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml index 6b2aff540..6f5bff228 100644 --- a/.azure/windows-stack.yml +++ b/.azure/windows-stack.yml @@ -8,7 +8,7 @@ jobs: stack-def: YAML_FILE: stack.yaml stack-8.8.2: - YAML_FILE: stack-8.6.5.yaml + YAML_FILE: stack-8.8.2.yaml stack-8.6.5: YAML_FILE: stack-8.6.5.yaml stack-8.6.4: From 559982c19e0aa50181880f58960c724a7342c729 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 27 Jan 2020 11:27:55 +0100 Subject: [PATCH 4/7] Remove ghc-8.8.2 for windows :-( --- .azure/windows-stack.yml | 4 ++-- install/src/Env.hs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml index 6f5bff228..72e38efe0 100644 --- a/.azure/windows-stack.yml +++ b/.azure/windows-stack.yml @@ -7,8 +7,8 @@ jobs: matrix: stack-def: YAML_FILE: stack.yaml - stack-8.8.2: - YAML_FILE: stack-8.8.2.yaml + # ghc versions 8.8.1 and 8.8.2 are not usable in windows + # due to https://gitlab.haskell.org/ghc/ghc/issues/17575 stack-8.6.5: YAML_FILE: stack-8.6.5.yaml stack-8.6.4: diff --git a/install/src/Env.hs b/install/src/Env.hs index b9b75d1cd..82dec2c7b 100644 --- a/install/src/Env.hs +++ b/install/src/Env.hs @@ -104,8 +104,8 @@ getHieVersions = do & mapMaybe (T.stripPrefix stackYamlPrefix >=> T.stripSuffix stackYamlSuffix) & map T.unpack - -- the following line excludes `8.6.3` and `8.8.1` on windows systems - & filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3","8.8.1"])) + -- the following line excludes `8.6.3`, `8.8.1` and `8.8.2` on windows systems + & filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3","8.8.1". "8.8.2"])) & sort return hieVersions From 8cbf3f97318698430647f004e603d83a98f99eab Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 27 Jan 2020 11:33:03 +0100 Subject: [PATCH 5/7] Correct list sep --- install/src/Env.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/src/Env.hs b/install/src/Env.hs index 82dec2c7b..90a1500ae 100644 --- a/install/src/Env.hs +++ b/install/src/Env.hs @@ -105,7 +105,7 @@ getHieVersions = do (T.stripPrefix stackYamlPrefix >=> T.stripSuffix stackYamlSuffix) & map T.unpack -- the following line excludes `8.6.3`, `8.8.1` and `8.8.2` on windows systems - & filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3","8.8.1". "8.8.2"])) + & filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3","8.8.1", "8.8.2"])) & sort return hieVersions From fe8034e6d5bcfacbac3a8b637ca20cdb2b879b47 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 27 Jan 2020 11:34:32 +0100 Subject: [PATCH 6/7] Correct formatting --- install/src/Env.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/src/Env.hs b/install/src/Env.hs index 90a1500ae..037e51bc9 100644 --- a/install/src/Env.hs +++ b/install/src/Env.hs @@ -105,7 +105,7 @@ getHieVersions = do (T.stripPrefix stackYamlPrefix >=> T.stripSuffix stackYamlSuffix) & map T.unpack -- the following line excludes `8.6.3`, `8.8.1` and `8.8.2` on windows systems - & filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3","8.8.1", "8.8.2"])) + & filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3", "8.8.1", "8.8.2"])) & sort return hieVersions From de18b2891ed04eb2a39fc15d196e2168cdd950cd Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Mon, 27 Jan 2020 11:08:07 +0000 Subject: [PATCH 7/7] Add stack-8.8.2.yaml to test utils --- test/utils/TestUtils.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/utils/TestUtils.hs b/test/utils/TestUtils.hs index 4d3bcc54d..b703f35c6 100644 --- a/test/utils/TestUtils.hs +++ b/test/utils/TestUtils.hs @@ -172,7 +172,9 @@ ghcVersion = GHC84 stackYaml :: FilePath stackYaml = -#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,1,0))) +#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,2,0))) + "stack-8.8.2.yaml" +#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,1,0))) "stack-8.8.1.yaml" #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,5,0))) "stack-8.6.5.yaml"