Remove support for ghc 8.8.3/8.10.5 (#2444)

* Remove support for ghc 8.8.3/8.10.5 * Remove ghc-8.10.5 from circleci * Correct releases links * Rename stack test dir * Parametrize stack wrapper test
haskell · Dec 10, 2021 · 1b69975 · 1b69975
1 parent 60880eb
commit 1b69975
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 261 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -84,21 +84,11 @@ jobs:
       - STACK_FILE: "stack-8.6.5.yaml"
     <<: *defaults
 
-  ghc-8.8.3:
-    environment:
-      - STACK_FILE: "stack-8.8.3.yaml"
-    <<: *defaults
-
   ghc-8.8.4:
     environment:
       - STACK_FILE: "stack-8.8.4.yaml"
     <<: *defaults
 
-  ghc-8.10.5:
-    environment:
-      - STACK_FILE: "stack-8.10.5.yaml"
-    <<: *defaults
-
   ghc-8.10.6:
     environment:
       - STACK_FILE: "stack-8.10.6.yaml"
@@ -125,9 +115,7 @@ workflows:
   multiple-ghcs:
     jobs:
       - ghc-8.6.5
-      - ghc-8.8.3
       - ghc-8.8.4
-      - ghc-8.10.5
       - ghc-8.10.6
       - ghc-8.10.7
       - ghc-9.0.1

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,12 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.0.1', '8.10.7', '8.10.6', '8.8.4', '8.8.3', '8.6.5']
+        ghc: ['9.0.1', '8.10.7', '8.10.6', '8.8.4', '8.6.5']
         os: [ubuntu-18.04, macOS-latest, windows-latest]
         cabal: ['3.6']
-        exclude:
-          - os: windows-latest
-            ghc: '8.8.3' # fails due to segfault
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml
@@ -46,12 +46,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
+        ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.6.5"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
         cabal: ['3.6']
-        exclude:
-          - os: windows-latest
-            ghc: '8.8.3'
 
     steps:
       - uses: actions/checkout@v2
@@ -74,12 +71,6 @@ jobs:
           echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
           echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
 
-      - if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
-        name: Workaround for GHC 8.10.5 on macOS
-        run: |
-          echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
-          sudo rm -rf /Library/Developer/CommandLineTools
-
       # Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file
       - if: matrix.ghc == '9.0.1'
         name: Use modified cabal.project for ghc9

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
+        ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.6.5"]
         os: [ubuntu-latest, macOS-latest]
         cabal: ['3.6']
         include:

diff --git a/docs/installation.md b/docs/installation.md
@@ -189,12 +189,11 @@ stack ./install.hs hls
 Install haskell-language-server for a specific GHC version (and hoogle docs):
 
 ```bash
-stack ./install.hs hls-8.8.3
+stack ./install.hs hls-8.10.7
 ```
 
-`hls-8.8.3` target will build the project and install `haskell-language-server-wrapper`,
-`haskell-language-server`, `haskell-language-server-8.8.3` and `haskell-language-server-8.8`
-executables.
+`hls-8.10.7` target will build the project and install `haskell-language-server-wrapper`,
+`haskell-language-server` and `haskell-language-server-8.10.7` executables.
 
 The Haskell Language Server can also be built with `cabal v2-build` instead of `stack build`.
 This has the advantage that you can decide how the GHC versions have been installed.
@@ -210,7 +209,7 @@ An example output is:
 ******************************************************************
 Found the following GHC paths:
 ghc-8.6.5: /opt/bin/ghc-8.6.5
-ghc-8.8.3: /opt/bin/ghc-8.8.3
+ghc-8.8.4: /opt/bin/ghc-8.8.4
 
 ******************************************************************
 ```

diff --git a/docs/supported-versions.md b/docs/supported-versions.md
@@ -6,17 +6,17 @@ The current support for different GHC versions is given in the following table.
 
 | GHC version | Last supporting HLS version                                                                                                                              | Deprecation status                       |
 | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- |
-| 9.2.0       | not supported yet                                                                                                                                        |                                          |
+| 9.2.0       | [not supported](https://github.com/haskell/haskell-language-server/issues/2179) yet                                                                                                                                        |                                          |
 | 9.0.1       | [current](https://github.com/haskell/haskell-language-server/releases/latest) ([partial](https://github.com/haskell/haskell-language-server/issues/297)) |                                          |
 | 8.10.7      | [current](https://github.com/haskell/haskell-language-server/releases/latest)                                                                            |                                          |
 | 8.10.6      | [current](https://github.com/haskell/haskell-language-server/releases/latest)                                                                            | will be deprecated after LTS and HLS full support for ghc-9.0 |
-| 8.10.5      | [1.5.0](https://github.com/haskell/haskell-language-server/releases/tag/1.5.0)                                                                           | deprecated                               |
+| 8.10.5      | [1.5.1](https://github.com/haskell/haskell-language-server/releases/tag/1.5.1)                                                                           | deprecated                               |
 | 8.10.4      | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0)                                                                           | deprecated                               |
 | 8.10.3      | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0)                                                                           | deprecated                               |
 | 8.10.2      | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0)                                                                           | deprecated                               |
 | 8.10.1      | [0.9.0](https://github.com/haskell/haskell-language-server/releases/tag/0.9.0)                                                                           | deprecated                               |
 | 8.8.4       | [current](https://github.com/haskell/haskell-language-server/releases/latest)                                                                            | will be deprecated after LTS and HLS full support for ghc-9.2 |
-| 8.8.3       | [1.5.0](https://github.com/haskell/haskell-language-server/releases/1.5.0)                                                                               | deprecated                               |
+| 8.8.3       | [1.5.1](https://github.com/haskell/haskell-language-server/releases/1.5.1)                                                                               | deprecated                               |
 | 8.8.2       | [1.2.0](https://github.com/haskell/haskell-language-server/releases/tag/1.2.0)                                                                           | deprecated                               |
 | 8.6.5       | [current](https://github.com/haskell/haskell-language-server/releases/latest)                                                                            | will be deprecated after LTS and HLS full suppot for ghc-9.2 |
 | 8.6.4       | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0)                                                                           | deprecated                               |

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/haskell-language-server/tree/master/ghcide#readme
 bug-reports:        https://github.com/haskell/haskell-language-server/issues
-tested-with:        GHC == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
+tested-with:        GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1
 extra-source-files: README.md CHANGELOG.md
                     test/data/**/*.project
                     test/data/**/*.cabal

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.5 || == 8.8.3 || == 8.8.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
+tested-with:        GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1
 extra-source-files:
   README.md
   ChangeLog.md

diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
diff --git a/test/wrapper/Main.hs b/test/wrapper/Main.hs
@@ -11,10 +11,8 @@ main = do
 
 projectGhcVersionTests :: TestTree
 projectGhcVersionTests = testGroup "--project-ghc-version"
-  [ testCase "stack with ghc 8.10.7" $
-      testDir "test/wrapper/testdata/stack-8.10.7" "8.10.7"
-  , testCase "stack with ghc 8.8.3" $
-      testDir "test/wrapper/testdata/stack-8.8.3" "8.8.3"
+  [ stackTest "8.10.7"
+  , stackTest "8.8.4"
   , testCase "cabal with global ghc" $ do
       ghcVer <- trimEnd <$> readProcess "ghc" ["--numeric-version"] ""
       testDir "test/wrapper/testdata/cabal-cur-ver" ghcVer
@@ -24,6 +22,9 @@ projectGhcVersionTests = testGroup "--project-ghc-version"
       testProjectType "test/wrapper/testdata/stack-with-dist-newstyle"
         ("cradleOptsProg = CradleAction: Cabal" `isInfixOf`)
   ]
+  where
+      stackTest ghcVer= testCase ("stack with ghc " ++ ghcVer) $
+        testDir ("test/wrapper/testdata/stack-" ++ ghcVer) ghcVer
 
 testDir :: FilePath -> String -> Assertion
 testDir dir expectedVer =

diff --git a/test/wrapper/testdata/stack-8.8.3/stack.yaml b/test/wrapper/testdata/stack-8.8.3/stack.yaml
diff --git a/test/wrapper/testdata/stack-8.8.3/Lib.hs → test/wrapper/testdata/stack-8.8.4/Lib.hs b/test/wrapper/testdata/stack-8.8.3/Lib.hs → test/wrapper/testdata/stack-8.8.4/Lib.hs
diff --git a/test/wrapper/testdata/stack-8.8.3/foo.cabal → test/wrapper/testdata/stack-8.8.4/foo.cabal b/test/wrapper/testdata/stack-8.8.3/foo.cabal → test/wrapper/testdata/stack-8.8.4/foo.cabal
diff --git a/test/wrapper/testdata/stack-8.8.4/stack.yaml b/test/wrapper/testdata/stack-8.8.4/stack.yaml
@@ -0,0 +1 @@
+resolver: ghc-8.8.4