Merge pull request #1331 from jneira/ghc-8.10.4

Add support for ghc-8.10.4 and drop it for ghc-8.10.1
haskell · Feb 10, 2021 · 2dcf2c6 · 2dcf2c6
2 parents 691d821 + 2d956cd
commit 2dcf2c6
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 159 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -96,11 +96,6 @@ jobs:
       - STACK_FILE: "stack-8.8.4.yaml"
     <<: *defaults
 
-  ghc-8.10.1:
-    environment:
-      - STACK_FILE: "stack-8.10.1.yaml"
-    <<: *defaults
-
   ghc-8.10.2:
     environment:
       - STACK_FILE: "stack-8.10.2.yaml"
@@ -111,6 +106,11 @@ jobs:
       - STACK_FILE: "stack-8.10.3.yaml"
     <<: *defaults
 
+  ghc-8.10.4:
+    environment:
+      - STACK_FILE: "stack-8.10.4.yaml"
+    <<: *defaults
+
   ghc-default:
     environment:
       - STACK_FILE: "stack.yaml"
@@ -126,7 +126,7 @@ workflows:
       - ghc-8.8.2
       - ghc-8.8.3
       - ghc-8.8.4
-      - ghc-8.10.1
       - ghc-8.10.2
       - ghc-8.10.3
+      - ghc-8.10.4
       - ghc-default
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -5,18 +5,18 @@ pull_request_rules:
       method: squash
   name: Automatically merge pull requests
   conditions:
-  - status-success=bench-example (8.10.3, ubuntu-latest, Cabal-3.0.0.0)
-  - status-success=bench-example (8.10.3, ubuntu-latest, lsp-types-1.0.0.1)
+  - status-success=bench-example (8.10.4, ubuntu-latest, Cabal-3.0.0.0)
+  - status-success=bench-example (8.10.4, ubuntu-latest, lsp-types-1.0.0.1)
 
   - status-success=nix (default, ubuntu-latest)
   - status-success=nix (default, macOS-latest)
 
+  - status-success=test (8.10.4, ubuntu-latest)
+  - status-success=test (8.10.4, macOS-latest)
   - status-success=test (8.10.3, ubuntu-latest)
   - status-success=test (8.10.3, macOS-latest)
   - status-success=test (8.10.2, ubuntu-latest)
   - status-success=test (8.10.2, macOS-latest)
-  - status-success=test (8.10.1, ubuntu-latest)
-  - status-success=test (8.10.1, macOS-latest)
   - status-success=test (8.8.4, ubuntu-latest)
   - status-success=test (8.8.4, macOS-latest)
   - status-success=test (8.8.3, ubuntu-latest)
@@ -27,15 +27,15 @@ pull_request_rules:
   - status-success=test (8.6.5, macOS-latest)
   - status-success=test (8.6.4, ubuntu-latest)
   - status-success=test (8.6.4, macOS-latest)
-  - status-success=test (windows-latest, 8.10.3, true)
+  - status-success=test (windows-latest, 8.10.4, true)
+  - status-success=test (windows-latest, 8.10.3)
   - status-success=test (windows-latest, 8.6.5, true)
   - status-success=test (windows-latest, 8.10.2.2)
-  - status-success=test (windows-latest, 8.10.1)
   # - status-success=test (windows-latest, 8.6.4)
 
+  - 'status-success=ci/circleci: ghc-8.10.4'
   - 'status-success=ci/circleci: ghc-8.10.3'
   - 'status-success=ci/circleci: ghc-8.10.2'
-  - 'status-success=ci/circleci: ghc-8.10.1'
   - 'status-success=ci/circleci: ghc-8.8.4'
   - 'status-success=ci/circleci: ghc-8.8.3'
   - 'status-success=ci/circleci: ghc-8.8.2'

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.3']
+        ghc: ['8.10.4']
         os: [ubuntu-latest]
 
     steps:
@@ -76,7 +76,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.3']
+        ghc: ['8.10.4']
         os: [ubuntu-latest]
         example: ['Cabal-3.0.0.0', 'lsp-types-1.0.0.1']
 

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.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
+        ghc: ['8.10.4', '8.10.3', '8.10.2', '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
@@ -113,11 +113,11 @@ jobs:
         path: ${{ steps.compress_server_binary.outputs.path }}
 
     - name: Build Wrapper
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS
 
     - name: Compress Wrapper Binary
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       id: compress_wrapper_binary
       run: |
         HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f)
@@ -136,7 +136,7 @@ jobs:
         fi
 
     - name: Upload Wrapper
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       uses: actions/[email protected]
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -147,7 +147,7 @@ jobs:
         asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}
 
     - uses: actions/upload-artifact@v2
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       with:
         name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
         path: ${{ steps.compress_wrapper_binary.outputs.path }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,20 +11,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        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"]
+        ghc: ["8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
         os: [ubuntu-latest, macOS-latest]
         include:
-          # one ghc-lib build
-          # should be renabled: #784
-          # - os: ubuntu-latest
-          #   ghc: '8.10.1'
-          #   ghc-lib: true
           # only test supported ghc major versions
           - os: ubuntu-latest
-            ghc: '8.10.3'
+            ghc: '8.10.4'
             test: true
           - os: windows-latest
-            ghc: '8.10.3'
+            ghc: '8.10.4'
             test: true
           - os: ubuntu-latest
             ghc: '8.8.4'
@@ -39,7 +34,7 @@ jobs:
           - os: windows-latest
             ghc: '8.10.2.2'
           - os: windows-latest
-            ghc: '8.10.1'
+            ghc: '8.10.3'
           # This build get stuck frequently
           # - os: windows-latest
           #   ghc: '8.6.4'

diff --git a/cabal.project b/cabal.project
@@ -25,7 +25,7 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2021-02-03T00:50:21Z
+index-state: 2021-02-08T19:11:03Z
 
 allow-newer:
 	active:base,

diff --git a/ghcide/.azure/linux-stack.yml b/ghcide/.azure/linux-stack.yml
diff --git a/ghcide/.azure/windows-stack.yml b/ghcide/.azure/windows-stack.yml
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -13,7 +13,7 @@ description:
     A library for building Haskell IDE's on top of the GHC API.
 homepage:           https://github.com/haskell/ghcide#readme
 bug-reports:        https://github.com/haskell/ghcide/issues
-tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.1 || == 8.10.2 || == 8.10.3
+tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
 extra-source-files: include/ghc-api-version.h README.md CHANGELOG.md
                     test/data/hover/*.hs
                     test/data/multi/cabal.project

diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs
@@ -3148,7 +3148,6 @@ checkFileCompiles fp diag =
 
 pluginSimpleTests :: TestTree
 pluginSimpleTests =
-  ignoreTest8101 "GHC #18070" $
   ignoreInWindowsForGHC88And810 $
   testSessionWithExtraFiles "plugin" "simple plugin" $ \dir -> do
     _ <- openDoc (dir </> "KnownNat.hs") "haskell"
@@ -3163,7 +3162,6 @@ pluginSimpleTests =
 
 pluginParsedResultTests :: TestTree
 pluginParsedResultTests =
-  ignoreTest8101 "GHC #18070" $
   ignoreInWindowsForGHC88And810 $
   testSessionWithExtraFiles "plugin" "parsedResultAction plugin" $ \dir -> do
     _ <- openDoc (dir</> "RecordDot.hs") "haskell"
@@ -4026,11 +4024,6 @@ pattern R x y x' y' = Range (Position x y) (Position x' y')
 xfail :: TestTree -> String -> TestTree
 xfail = flip expectFailBecause
 
-ignoreTest8101 :: String -> TestTree -> TestTree
-ignoreTest8101
-  | GHC_API_VERSION == ("8.10.1" :: String) = ignoreTestBecause
-  | otherwise = const id
-
 ignoreInWindowsBecause :: String -> TestTree -> TestTree
 ignoreInWindowsBecause = if isWindows then ignoreTestBecause else (\_ x -> x)
 

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -14,7 +14,7 @@ copyright:          The Haskell IDE Team
 license:            Apache-2.0
 license-file:       LICENSE
 build-type:         Simple
-tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.1 || == 8.10.2 || == 8.10.3
+tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
 extra-source-files:
   README.md
   ChangeLog.md

diff --git a/nix/default.nix b/nix/default.nix
@@ -35,9 +35,9 @@ let
         ourHaskell = pkgs.haskell // {
             packages = pkgs.haskell.packages // {
                 # relax upper bounds on ghc 8.10.x versions (and skip running tests)
-                ghc8101 = extended (pkgs.haskell.packages.ghc8101.override sharedOverrides);
                 ghc8102 = extended (pkgs.haskell.packages.ghc8102.override sharedOverrides);
                 ghc8103 = extended (pkgs.haskell.packages.ghc8103.override sharedOverrides);
+                ghc8104 = extended (pkgs.haskell.packages.ghc8104.override sharedOverrides);
             };
         };
         };

diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2021-01-17
+resolver: nightly-2021-02-06
 
 packages:
   - .
@@ -19,14 +19,12 @@ ghc-options:
   "$everything": -haddock
 
 extra-deps:
-  - apply-refact-0.9.0.0
   - 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
-  - ghc-exactprint-0.6.3.4
   - heapsize-0.3.0
   - implicit-hie-cradle-0.3.0.2
   - implicit-hie-0.1.2.5