Support for ghc-8.8.3

.azure/linux-cabal.yml

@@ -5,6 +5,8 @@ jobs:
     vmImage: ubuntu-16.04
   strategy:
     matrix:
+      ghc-8.8.3:
+        GHC_VERSION: "8.8.3"
       ghc-8.8.2:
         GHC_VERSION: "8.8.2"
       ghc-8.6.5:

.azure/linux-stack.yml

@@ -7,10 +7,10 @@ jobs:
     matrix:
       stack-def:
         YAML_FILE: stack.yaml
+      stack-8.8.3:
+        YAML_FILE: stack-8.8.3.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:
         YAML_FILE: stack-8.6.5.yaml
       stack-8.6.4:

.azure/macos-installhs-cabal.yml

@@ -21,8 +21,7 @@ jobs:
     displayName: "Unpack cache"
     condition: eq(variables.CACHE_RESTORED, 'true')
   - bash: |
-      # TODO Install ghc-8.8.3 when adding stack-8.8.3.yaml 
-      brew install [email protected]
+      brew install [email protected]
       brew install cabal-install --ignore-dependencies ghc
       which cabal
       which ghc

.azure/macos-stack.yml

@@ -7,10 +7,10 @@ jobs:
     matrix:
       stack-def:
         YAML_FILE: stack.yaml
+      stack-8.8.3:
+        YAML_FILE: stack-8.8.3.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:
         YAML_FILE: stack-8.6.5.yaml
       stack-8.6.4:

.azure/windows-cabal.yml

@@ -7,8 +7,8 @@ jobs:
     matrix:
       # ghc versions 8.8.1 and 8.8.2 are not usable in windows
       # due to https://gitlab.haskell.org/ghc/ghc/issues/17575
-      # ghc-8.8.2:
-      #   GHC_VERSION: "8.8.2"
+      # ghc-8.8.3 throws segfaults in ci envs so we can't use it neither
+      # due to https://gitlab.haskell.org/ghc/ghc/issues/17926
       ghc-8.6.5:
         GHC_VERSION: "8.6.5"
       ghc-8.4.4:
@@ -106,8 +106,8 @@ jobs:
   - bash: |
       source .azure/windows-cabal.bashrc
       # Needed for wrapper-test
-      stack setup --stack-yaml stack-8.8.1.yaml
-      stack setup --stack-yaml stack-8.6.5.yaml
+      stack setup --resolver ghc-8.8.1
+      stack setup --resolver ghc-8.6.5
       # TODO Enable :dispatcher-test suite
       cabal v2-test :plugin-dispatcher-test :wrapper-test # :dispatcher-test --project-file $PROJECT_FILE
     displayName: "Run Test: dispatcher-test, plugin-dispatcher-test and wrapper-test"

.azure/windows-installhs-stack.yml

@@ -6,6 +6,7 @@ jobs:
   variables:
     YAML_FILE: install/shake.yaml
     STACK_ROOT: "C:\\sr"
+    GHC_VERSION: "8.6.5"
   steps:
   - task: Cache@2
     inputs:
@@ -46,7 +47,8 @@ jobs:
   - bash: |
       source .azure/windows-stack.bashrc
       # Some executions fails with spurious errors installing executables
-      stack install.hs latest || stack install.hs latest
+      # We can't install the latest target cause it is ghc-8.8.3 and throws segfaults
+      stack install.hs hie-${GHC_VERSION} || stack install.hs hie-${GHC_VERSION}
     displayName: Run latest target of `install.hs`
   - bash: |
       mkdir -p .azure-cache

.azure/windows-stack.yml

@@ -5,12 +5,14 @@ jobs:
     vmImage: windows-2019
   strategy:
     matrix:
-      # default stack.yaml uses ghc-8.8.2 so we can't use it for windows
-      # TODO: Enable it when it uses ghc-8.8.3
+      # default stack.yaml uses ghc-8.8.3 so we can't use it for windows
+      # TODO: Enable it when it uses a version without bugs for windows
       # stack-def:
       #  YAML_FILE: stack.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
+      # ghc-8.8.3 throws segfaults in ci envs so we can't use it neither
+      # due to https://gitlab.haskell.org/ghc/ghc/issues/17926
       stack-8.6.5:
         YAML_FILE: stack-8.6.5.yaml
       stack-8.6.4:
@@ -117,8 +119,8 @@ jobs:
   - bash: |
       source .azure/windows-stack.bashrc
       # Needed for wrapper-test
-      stack setup --stack-yaml stack-8.8.1.yaml
-      stack setup --stack-yaml stack-8.6.5.yaml
+      stack setup --resolver ghc-8.8.1
+      stack setup --resolver ghc-8.6.5
       # TODO: Enable :dispatcher-test suite
       stack test :plugin-dispatcher-test :wrapper-test --stack-yaml $(YAML_FILE)
     displayName: "Run Test: dispatcher-test, plugin-dispatcher-test and wrapper-test"

.circleci/config.yml

@@ -126,14 +126,14 @@ jobs:
       - STACK_FILE: "stack-8.6.5.yaml"
     <<: *defaults
 
-  ghc-8.8.1:
+  ghc-8.8.2:
     environment:
-      - STACK_FILE: "stack-8.8.1.yaml"
+      - STACK_FILE: "stack-8.8.2.yaml"
     <<: *defaults
 
-  ghc-8.8.2:
+  ghc-8.8.3:
     environment:
-      - STACK_FILE: "stack-8.8.2.yaml"
+      - STACK_FILE: "stack-8.8.3.yaml"
     <<: *defaults
 
   ghc-nightly:
@@ -181,7 +181,7 @@ workflows:
       - ghc-8.4.4
       - ghc-8.6.4
       - ghc-8.6.5
-      - ghc-8.8.1
       - ghc-8.8.2
+      - ghc-8.8.3
       - ghc-nightly
       - cabal

install/shake.yaml

@@ -1,7 +1,7 @@
 # Used to provide a different environment for the shake build script
-resolver: lts-13.19 # last lts with GHC 8.6.5
-# resolver: nightly-2020-01-31 # GHC 8.8.2
-# resolver: nightly-2020-01-21 # last nightly GHC 8.8.1
+resolver: lts-14.27 # last lts GHC 8.6.5
+# resolver: lts-15.7 # lts GHC 8.8.3
+# resolver: lts-15.3 # last lts GHC 8.8.2
 # resolver: lts-13.19 # last lts GHC 8.6.4
 # resolver: lts-12.26 # last lts GHC 8.4.4
 # resolver: lts-12.14 # last lts GHC 8.4.3

stack-8.8.1.yaml → stack-8.8.3.yaml

@@ -1,39 +1,28 @@
-resolver: nightly-2020-01-21 # last GHC 8.8.1
+resolver: lts-15.4
 packages:
 - .
 - hie-plugin-api
 
 extra-deps:
 # - ./submodules/HaRe
 
-- aeson-1.4.6.0
 - apply-refact-0.7.0.0
-- brittany-0.12.1.1
-- bytestring-trie-0.2.5.0
+- bytestring-trie-0.2.5.0@rev1
 # - cabal-helper-1.0.0.0
 - github: DanielG/cabal-helper
   commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
 - clock-0.7.2
 - constrained-dynamic-0.1.0.0
-- extra-1.6.21
 - floskell-0.10.2
-- ghc-lib-parser-ex-8.8.5.3
-- haddock-api-2.23.0
-- haddock-library-1.8.0
-- haskell-lsp-0.20.0.0
-- haskell-lsp-types-0.20.0.0
-- lsp-test-0.10.1.0
-- hie-bios-0.4.0
-- hlint-2.2.11
+- haddock-api-2.23.1
 - hoogle-5.0.17.15
 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170
+- ghc-lib-parser-8.8.2.20200205
+- ghc-lib-parser-ex-8.8.5.3
 - ilist-0.3.1.0
 - monad-dijkstra-0.1.1.2
-- ormolu-0.0.3.1
-- resourcet-1.2.3 # forced by unliftio-core >= 0.2
 - semigroups-0.18.5
 - temporary-1.2.1.1
-- unliftio-0.2.12.1
 - unliftio-core-0.2.0.1
 
 flags:
@@ -42,8 +31,6 @@ flags:
   hie-plugin-api:
     pedantic: true
 
-# allow-newer: true
-
 nix:
   packages: [ icu libcxx zlib ]
 

stack.yaml

@@ -1,4 +1,5 @@
-resolver: nightly-2020-03-09  # Last GHC 8.8.2
+resolver: nightly-2020-04-09
+
 packages:
 - .
 - hie-plugin-api
@@ -7,8 +8,7 @@ extra-deps:
 # - ./submodules/HaRe
 
 - apply-refact-0.7.0.0
-- brittany-0.12.1.1
-- bytestring-trie-0.2.5.0
+- bytestring-trie-0.2.5.0@sha256:9efa9c6f556314d28486be2470ff789419c5238ed2e354870623a3cbbd28fbe2,3349
 # - cabal-helper-1.0.0.0
 - github: DanielG/cabal-helper
   commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
@@ -21,18 +21,14 @@ extra-deps:
 - haddock-library-1.8.0
 - haskell-lsp-0.20.0.0
 - haskell-lsp-types-0.20.0.0
+- haskell-src-exts-1.22.0
 - lsp-test-0.10.1.0
-- hie-bios-0.4.0
-- hlint-2.2.11
 - hoogle-5.0.17.15
 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170
 - ilist-0.3.1.0
 - monad-dijkstra-0.1.1.2
-- ormolu-0.0.3.1
-- resourcet-1.2.3 # forced by unliftio-core >= 0.2
 - semigroups-0.18.5
 - temporary-1.2.1.1
-- unliftio-0.2.12.1
 - unliftio-core-0.2.0.1
 
 flags:
@@ -41,8 +37,6 @@ flags:
   hie-plugin-api:
     pedantic: true
 
-# allow-newer: true
-
 nix:
   packages: [ icu libcxx zlib ]
 

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,2,0)))
+#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,3,0)))
+  "stack-8.8.3.yaml"
+#elif (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"