Merge pull request #721 from jneira/mergepocalypse-8.10.3

jneira · web-flow · commit 4d33fd192b2d · 2021-01-02T11:55:03.000+01:00
Add ghc-8.10.3 support after merging ghcide repo
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -137,15 +137,22 @@ jobs:
       - STACK_FILE: "stack-8.10.2.yaml"
     <<: *defaults
 
-  ghc-nightly:
+  ghc-8.10.3:
+    environment:
+      - STACK_FILE: "stack-8.10.3.yaml"
+    <<: *defaults
+
+  ghc-default:
     environment:
       - STACK_FILE: "stack.yaml"
     <<: *defaults
 
   cabal:
     working_directory: ~/build
     docker:
-      - image: haskell:8.10.1
+      # We have to wait to a docker image with ghc-8.10.3
+      # See https://github.com/haskell/docker-haskell/issues/31
+      - image: haskell:8.10.2
     steps:
       - checkout
       - run:
@@ -191,5 +198,6 @@ workflows:
       - ghc-8.8.4
       - ghc-8.10.1
       - ghc-8.10.2
-      # - ghc-nightly
+      - ghc-8.10.3
+      - ghc-default
       - cabal
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
+        ghc: ['8.10.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
         os: [ubuntu-latest, macOS-latest, windows-latest]
         exclude:
           - os: windows-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: ["8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
+        ghc: ['8.10.3', "8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
         os: [ubuntu-latest, windows-latest]
         exclude:
           - os: windows-latest
diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml
@@ -23,8 +23,8 @@ extra-deps:
   - data-tree-print-0.1.0.2@rev:2
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - ghc-lib-8.10.2.20200916
-  - ghc-lib-parser-8.10.2.20200916
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
   - heapsize-0.3.0
   - hie-bios-0.7.1
   - hlint-3.2.3
diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
@@ -23,6 +23,8 @@ extra-deps:
   - data-tree-print-0.1.0.2@rev:2
   - floskell-0.10.4
   - fourmolu-0.3.0.0
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
   - heapsize-0.3.0
   - implicit-hie-cradle-0.3.0.2
   - implicit-hie-0.1.2.5
diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
@@ -0,0 +1,54 @@
+resolver: nightly-2021-01-01 # first ghc-8.10.3 nightly
+
+packages:
+  - .
+  - ./hie-compat
+  - ./ghcide/
+  - ./hls-plugin-api
+  # - ./shake-bench
+  - ./plugins/hls-class-plugin
+  - ./plugins/hls-eval-plugin
+  - ./plugins/hls-explicit-imports-plugin
+  - ./plugins/hls-hlint-plugin
+  - ./plugins/hls-retrie-plugin
+  - ./plugins/tactics
+
+ghc-options:
+  "$everything": -haddock
+
+extra-deps:
+  - brittany-0.13.1.0
+  - Cabal-3.0.2.0
+  - clock-0.7.2
+  - data-tree-print-0.1.0.2@rev:2
+  - floskell-0.10.4
+  - fourmolu-0.3.0.0
+  - heapsize-0.3.0
+  - implicit-hie-cradle-0.3.0.2
+  - implicit-hie-0.1.2.5
+  - lsp-test-0.11.0.6
+  - monad-dijkstra-0.1.1.2
+  - refinery-0.3.0.0
+  - retrie-0.1.1.1
+  - stylish-haskell-0.12.2.0
+  - semigroups-0.18.5
+  - temporary-1.2.1.1
+
+configure-options:
+  ghcide:
+      - --disable-library-for-ghci
+  haskell-language-server:
+      - --disable-library-for-ghci
+  heapsize:
+      - --disable-library-for-ghci
+
+flags:
+  haskell-language-server:
+    pedantic: true
+  retrie:
+    BuildExecutable: false
+
+nix:
+  packages: [ icu libcxx zlib ]
+
+concurrent-tests: false
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -36,9 +36,9 @@ extra-deps:
   - ghc-check-0.5.0.1
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.3.2
-  - ghc-lib-8.10.2.20200916
-  - ghc-lib-parser-8.10.2.20200916
-  - ghc-lib-parser-ex-8.10.0.16
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
+  - ghc-lib-parser-ex-8.10.0.17
   - ghc-source-gen-0.4.0.0
   - ghc-trace-events-0.1.2.1
   - haddock-api-2.22.0@rev:1
@@ -70,8 +70,6 @@ extra-deps:
   - regex-tdfa-1.3.1.0
   - retrie-0.1.1.1
   - semialign-1.1
-  # - github: wz1000/shake
-  #   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
   - stylish-haskell-0.12.2.0
   - tasty-rerun-1.1.17
   - temporary-1.2.1.1
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -35,9 +35,9 @@ extra-deps:
   - ghc-check-0.5.0.1
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.3.2
-  - ghc-lib-8.10.2.20200916
-  - ghc-lib-parser-8.10.2.20200916
-  - ghc-lib-parser-ex-8.10.0.16
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
+  - ghc-lib-parser-ex-8.10.0.17
   - ghc-source-gen-0.4.0.0
   - ghc-trace-events-0.1.2.1
   - haddock-api-2.22.0@rev:1
@@ -69,8 +69,6 @@ extra-deps:
   - regex-tdfa-1.3.1.0
   - retrie-0.1.1.1
   - semialign-1.1
-  # - github: wz1000/shake
-  #   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
   - stylish-haskell-0.12.2.0
   - tasty-rerun-1.1.17
   - temporary-1.2.1.1
diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml
@@ -31,9 +31,9 @@ extra-deps:
   - ghc-check-0.5.0.1
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.3.2
-  - ghc-lib-8.10.2.20200916
-  - ghc-lib-parser-8.10.2.20200916
-  - ghc-lib-parser-ex-8.10.0.16
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
+  - ghc-lib-parser-ex-8.10.0.17
   - ghc-trace-events-0.1.2.1
   - haddock-library-1.8.0
   - haskell-lsp-0.22.0.0
@@ -57,8 +57,6 @@ extra-deps:
   - refinery-0.3.0.0
   - retrie-0.1.1.1
   - semigroups-0.18.5
-  # - github: wz1000/shake
-  #   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
   - stylish-haskell-0.12.2.0
   - temporary-1.2.1.1
   - these-1.1.1.1
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -29,8 +29,8 @@ extra-deps:
   - fourmolu-0.3.0.0
   # - ghcide-0.6.0
   - ghc-exactprint-0.6.3.2
-  - ghc-lib-8.10.2.20200916
-  - ghc-lib-parser-8.10.2.20200916
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
   - ghc-trace-events-0.1.2.1
   - haskell-src-exts-1.21.1
   - heapsize-0.3.0
diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -28,6 +28,8 @@ extra-deps:
   - fourmolu-0.3.0.0
   # - ghcide-0.6.0
   - ghc-exactprint-0.6.3.2
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
   - ghc-trace-events-0.1.2.1
   - haskell-src-exts-1.21.1
   - heapsize-0.3.0
diff --git a/stack.yaml b/stack.yaml
@@ -3,9 +3,9 @@ resolver: lts-14.27 # Last 8.6.5
 packages:
   - .
   - ./hie-compat
-  - ./ghcide
-  - ./shake-bench
+  - ./ghcide/
   - ./hls-plugin-api
+  # - ./shake-bench
   - ./plugins/hls-class-plugin
   - ./plugins/hls-eval-plugin
   - ./plugins/hls-explicit-imports-plugin
@@ -35,9 +35,9 @@ extra-deps:
   - ghc-check-0.5.0.1
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.3.2
-  - ghc-lib-8.10.2.20200916
-  - ghc-lib-parser-8.10.2.20200916
-  - ghc-lib-parser-ex-8.10.0.16
+  - ghc-lib-8.10.3.20201220
+  - ghc-lib-parser-8.10.3.20201220
+  - ghc-lib-parser-ex-8.10.0.17
   - ghc-source-gen-0.4.0.0
   - ghc-trace-events-0.1.2.1
   - haddock-api-2.22.0@rev:1
@@ -69,8 +69,6 @@ extra-deps:
   - regex-tdfa-1.3.1.0
   - retrie-0.1.1.1
   - semialign-1.1
-  # - github: wz1000/shake
-  #   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
   - stylish-haskell-0.12.2.0
   - tasty-rerun-1.1.17
   - temporary-1.2.1.1
@@ -80,12 +78,6 @@ extra-deps:
   - with-utf8-1.0.2.1@sha256:95c02fffa643ddbeb092359802a512007c3e644cd509809f4716ad54592c437b,3057
   - th-env-0.1.0.2@sha256:d8f1f37f42a8f1a22404d7d0579528af18f5dac7232cca6bdbd5117c115a0ad5,1370
 
-flags:
-  haskell-language-server:
-    pedantic: true
-  retrie:
-    BuildExecutable: false
-
 configure-options:
   ghcide:
     - --disable-library-for-ghci
@@ -94,6 +86,12 @@ configure-options:
   heapsize:
     - --disable-library-for-ghci
 
+flags:
+  haskell-language-server:
+    pedantic: true
+  retrie:
+    BuildExecutable: false
+
 # allow-newer: true
 
 nix:
