Skip to content

Commit 1b69975

Browse files
jneirajneira
authored
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
1 parent 60880eb commit 1b69975

File tree

15 files changed

+18
-261
lines changed

15 files changed

+18
-261
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,11 @@ jobs:
8484
- STACK_FILE: "stack-8.6.5.yaml"
8585
<<: *defaults
8686

87-
ghc-8.8.3:
88-
environment:
89-
- STACK_FILE: "stack-8.8.3.yaml"
90-
<<: *defaults
91-
9287
ghc-8.8.4:
9388
environment:
9489
- STACK_FILE: "stack-8.8.4.yaml"
9590
<<: *defaults
9691

97-
ghc-8.10.5:
98-
environment:
99-
- STACK_FILE: "stack-8.10.5.yaml"
100-
<<: *defaults
101-
10292
ghc-8.10.6:
10393
environment:
10494
- STACK_FILE: "stack-8.10.6.yaml"
@@ -125,9 +115,7 @@ workflows:
125115
multiple-ghcs:
126116
jobs:
127117
- ghc-8.6.5
128-
- ghc-8.8.3
129118
- ghc-8.8.4
130-
- ghc-8.10.5
131119
- ghc-8.10.6
132120
- ghc-8.10.7
133121
- ghc-9.0.1

‎.github/workflows/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.8.4', '8.8.3', '8.6.5']
21+
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.8.4', '8.6.5']
2222
os: [ubuntu-18.04, macOS-latest, windows-latest]
2323
cabal: ['3.6']
24-
exclude:
25-
- os: windows-latest
26-
ghc: '8.8.3' # fails due to segfault
2724

2825
steps:
2926
- uses: actions/checkout@v2

‎.github/workflows/caching.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,9 @@ jobs:
4646
runs-on: ${{ matrix.os }}
4747
strategy:
4848
matrix:
49-
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
49+
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.6.5"]
5050
os: [ubuntu-latest, macOS-latest, windows-latest]
5151
cabal: ['3.6']
52-
exclude:
53-
- os: windows-latest
54-
ghc: '8.8.3'
5552

5653
steps:
5754
- uses: actions/checkout@v2
@@ -74,12 +71,6 @@ jobs:
7471
echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
7572
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
7673
77-
- if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
78-
name: Workaround for GHC 8.10.5 on macOS
79-
run: |
80-
echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
81-
sudo rm -rf /Library/Developer/CommandLineTools
82-
8374
# Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file
8475
- if: matrix.ghc == '9.0.1'
8576
name: Use modified cabal.project for ghc9

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
strategy:
4141
fail-fast: true
4242
matrix:
43-
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
43+
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.6.5"]
4444
os: [ubuntu-latest, macOS-latest]
4545
cabal: ['3.6']
4646
include:

‎docs/installation.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,11 @@ stack ./install.hs hls
189189
Install haskell-language-server for a specific GHC version (and hoogle docs):
190190

191191
```bash
192-
stack ./install.hs hls-8.8.3
192+
stack ./install.hs hls-8.10.7
193193
```
194194

195-
`hls-8.8.3` target will build the project and install `haskell-language-server-wrapper`,
196-
`haskell-language-server`, `haskell-language-server-8.8.3` and `haskell-language-server-8.8`
197-
executables.
195+
`hls-8.10.7` target will build the project and install `haskell-language-server-wrapper`,
196+
`haskell-language-server` and `haskell-language-server-8.10.7` executables.
198197

199198
The Haskell Language Server can also be built with `cabal v2-build` instead of `stack build`.
200199
This has the advantage that you can decide how the GHC versions have been installed.
@@ -210,7 +209,7 @@ An example output is:
210209
******************************************************************
211210
Found the following GHC paths:
212211
ghc-8.6.5: /opt/bin/ghc-8.6.5
213-
ghc-8.8.3: /opt/bin/ghc-8.8.3
212+
ghc-8.8.4: /opt/bin/ghc-8.8.4
214213
215214
******************************************************************
216215
```

‎docs/supported-versions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ The current support for different GHC versions is given in the following table.
66

77
| GHC version | Last supporting HLS version | Deprecation status |
88
| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- |
9-
| 9.2.0 | not supported yet | |
9+
| 9.2.0 | [not supported](https://github.com/haskell/haskell-language-server/issues/2179) yet | |
1010
| 9.0.1 | [current](https://github.com/haskell/haskell-language-server/releases/latest) ([partial](https://github.com/haskell/haskell-language-server/issues/297)) | |
1111
| 8.10.7 | [current](https://github.com/haskell/haskell-language-server/releases/latest) | |
1212
| 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 |
13-
| 8.10.5 | [1.5.0](https://github.com/haskell/haskell-language-server/releases/tag/1.5.0) | deprecated |
13+
| 8.10.5 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/tag/1.5.1) | deprecated |
1414
| 8.10.4 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
1515
| 8.10.3 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
1616
| 8.10.2 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
1717
| 8.10.1 | [0.9.0](https://github.com/haskell/haskell-language-server/releases/tag/0.9.0) | deprecated |
1818
| 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 |
19-
| 8.8.3 | [1.5.0](https://github.com/haskell/haskell-language-server/releases/1.5.0) | deprecated |
19+
| 8.8.3 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/1.5.1) | deprecated |
2020
| 8.8.2 | [1.2.0](https://github.com/haskell/haskell-language-server/releases/tag/1.2.0) | deprecated |
2121
| 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 |
2222
| 8.6.4 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |

‎ghcide/ghcide.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description:
1313
A library for building Haskell IDE's on top of the GHC API.
1414
homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
1515
bug-reports: https://github.com/haskell/haskell-language-server/issues
16-
tested-with: GHC == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
16+
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1
1717
extra-source-files: README.md CHANGELOG.md
1818
test/data/**/*.project
1919
test/data/**/*.cabal

‎haskell-language-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ copyright: The Haskell IDE Team
1414
license: Apache-2.0
1515
license-file: LICENSE
1616
build-type: Simple
17-
tested-with: GHC == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
17+
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md

‎stack-8.10.5.yaml

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎stack-8.8.3.yaml

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎test/wrapper/Main.hs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ main = do
1111

1212
projectGhcVersionTests :: TestTree
1313
projectGhcVersionTests = testGroup "--project-ghc-version"
14-
[ testCase "stack with ghc 8.10.7" $
15-
testDir "test/wrapper/testdata/stack-8.10.7" "8.10.7"
16-
, testCase "stack with ghc 8.8.3" $
17-
testDir "test/wrapper/testdata/stack-8.8.3" "8.8.3"
14+
[ stackTest "8.10.7"
15+
, stackTest "8.8.4"
1816
, testCase "cabal with global ghc" $ do
1917
ghcVer <- trimEnd <$> readProcess "ghc" ["--numeric-version"] ""
2018
testDir "test/wrapper/testdata/cabal-cur-ver" ghcVer
@@ -24,6 +22,9 @@ projectGhcVersionTests = testGroup "--project-ghc-version"
2422
testProjectType "test/wrapper/testdata/stack-with-dist-newstyle"
2523
("cradleOptsProg = CradleAction: Cabal" `isInfixOf`)
2624
]
25+
where
26+
stackTest ghcVer= testCase ("stack with ghc " ++ ghcVer) $
27+
testDir ("test/wrapper/testdata/stack-" ++ ghcVer) ghcVer
2728

2829
testDir :: FilePath -> String -> Assertion
2930
testDir dir expectedVer =

‎test/wrapper/testdata/stack-8.8.3/stack.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/wrapper/testdata/stack-8.8.3/Lib.hs renamed to ‎test/wrapper/testdata/stack-8.8.4/Lib.hs

File renamed without changes.

‎test/wrapper/testdata/stack-8.8.3/foo.cabal renamed to ‎test/wrapper/testdata/stack-8.8.4/foo.cabal

File renamed without changes.

‎test/wrapper/testdata/stack-8.8.4/stack.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
resolver: ghc-8.8.4

0 commit comments

Comments
 (0)