Skip to content

Commit 3bfb9b3

Browse files
jneirajneira
authored
Drop ghc support for 8.6.4, 8.10.2, 8.10.3, 8.10.4 (#2197)
* Remove outdated setup troubleshooting * Remove ghc-8.6.4 support * Remove ghc-8.10.2 support * Remove ghc-8.10.3 support * Remove ghc-8.10.4 support * Complete list of tested ghcs * Update stack resolvers * Update hackage index * Set 8.10.7 as default stack.yaml * Use extra 1.7.9
1 parent ed67f2c commit 3bfb9b3

30 files changed

+56
-665
lines changed

Diff for: ‎.circleci/config.yml

-24
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ defaults: &defaults
4646

4747
version: 2
4848
jobs:
49-
ghc-8.6.4:
50-
environment:
51-
- STACK_FILE: "stack-8.6.4.yaml"
52-
<<: *defaults
53-
5449
ghc-8.6.5:
5550
environment:
5651
- STACK_FILE: "stack-8.6.5.yaml"
@@ -66,21 +61,6 @@ jobs:
6661
- STACK_FILE: "stack-8.8.4.yaml"
6762
<<: *defaults
6863

69-
ghc-8.10.2:
70-
environment:
71-
- STACK_FILE: "stack-8.10.2.yaml"
72-
<<: *defaults
73-
74-
ghc-8.10.3:
75-
environment:
76-
- STACK_FILE: "stack-8.10.3.yaml"
77-
<<: *defaults
78-
79-
ghc-8.10.4:
80-
environment:
81-
- STACK_FILE: "stack-8.10.4.yaml"
82-
<<: *defaults
83-
8464
ghc-8.10.5:
8565
environment:
8666
- STACK_FILE: "stack-8.10.5.yaml"
@@ -111,13 +91,9 @@ workflows:
11191
version: 2
11292
multiple-ghcs:
11393
jobs:
114-
- ghc-8.6.4
11594
- ghc-8.6.5
11695
- ghc-8.8.3
11796
- ghc-8.8.4
118-
- ghc-8.10.2
119-
- ghc-8.10.3
120-
- ghc-8.10.4
12197
- ghc-8.10.5
12298
- ghc-8.10.6
12399
- ghc-8.10.7

Diff for: ‎.github/workflows/bench.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
ghc: ['8.10.4']
27+
ghc: ['8.10.7']
2828
os: [ubuntu-latest]
2929

3030
steps:
@@ -106,7 +106,7 @@ jobs:
106106
strategy:
107107
fail-fast: false
108108
matrix:
109-
ghc: ['8.10.4']
109+
ghc: ['8.10.7']
110110
os: [ubuntu-latest]
111111
example: ['cabal', 'lsp-types']
112112

Diff for: ‎.github/workflows/build.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,11 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.10.5', '8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.6.5', '8.6.4']
19+
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.10.5', '8.8.4', '8.8.3', '8.6.5']
2020
os: [ubuntu-18.04, macOS-latest, windows-latest]
2121
exclude:
22-
- os: windows-latest
23-
ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
2422
- os: windows-latest
2523
ghc: '8.8.3' # fails due to segfault
26-
include:
27-
- os: windows-latest
28-
ghc: '8.10.2.2' # only available for windows and choco
2924

3025
steps:
3126
- uses: actions/checkout@v2
@@ -54,8 +49,6 @@ jobs:
5449
GHC_VER: ${{ matrix.ghc }}
5550
run: |
5651
echo "EXE_EXT=.exe" >> $GITHUB_ENV
57-
# We normalize windows+choco ghc version 8.10.2.2
58-
GHC_VER=$(echo $GHC_VER | sed 's/8.10.2.2/8.10.2/g')
5952
echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
6053
6154
- name: Set some linux specific things
@@ -125,11 +118,11 @@ jobs:
125118
path: ${{ steps.compress_server_binary.outputs.path }}
126119

127120
- name: Build Wrapper
128-
if: matrix.ghc == '8.10.4'
121+
if: matrix.ghc == '8.10.7'
129122
run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS
130123

131124
- name: Compress Wrapper Binary
132-
if: matrix.ghc == '8.10.4'
125+
if: matrix.ghc == '8.10.7'
133126
id: compress_wrapper_binary
134127
run: |
135128
HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f)
@@ -148,7 +141,7 @@ jobs:
148141
fi
149142
150143
- name: Upload Wrapper
151-
if: matrix.ghc == '8.10.4'
144+
if: matrix.ghc == '8.10.7'
152145
uses: actions/[email protected]
153146
env:
154147
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -159,7 +152,7 @@ jobs:
159152
asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}
160153

161154
- uses: actions/upload-artifact@v2
162-
if: matrix.ghc == '8.10.4'
155+
if: matrix.ghc == '8.10.7'
163156
with:
164157
name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
165158
path: ${{ steps.compress_wrapper_binary.outputs.path }}

Diff for: ‎.github/workflows/test.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
strategy:
3434
fail-fast: true
3535
matrix:
36-
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.10.5", "8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.6.5", "8.6.4"]
36+
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.10.5", "8.8.4", "8.8.3", "8.6.5"]
3737
os: [ubuntu-latest, macOS-latest]
3838
include:
3939
# only test supported ghc major versions
@@ -63,18 +63,8 @@ jobs:
6363
ghc: '8.10.6'
6464
- os: windows-latest
6565
ghc: '8.10.5'
66-
- os: windows-latest
67-
ghc: '8.10.4'
68-
- os: windows-latest
69-
ghc: '8.10.3'
7066
- os: windows-latest
7167
ghc: '8.8.4'
72-
# These builds get stuck frequently
73-
# - os: windows-latest
74-
# ghc: '8.10.2.2'
75-
76-
# - os: windows-latest
77-
# ghc: '8.6.4'
7868

7969
steps:
8070
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}

Diff for: ‎cabal-ghc901.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ source-repository-package
6161

6262
write-ghc-environment-files: never
6363

64-
index-state: 2021-09-06T12:12:22Z
64+
index-state: 2021-09-16T07:00:23Z
6565

6666
constraints:
6767
-- These plugins don't work on GHC9 yet

Diff for: ‎cabal-ghc921.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ source-repository-package
5757

5858
write-ghc-environment-files: never
5959

60-
index-state: 2021-08-31T02:21:16Z
60+
index-state: 2021-09-16T07:00:23Z
6161

6262
constraints:
6363
-- These plugins doesn't work on GHC9 yet

Diff for: ‎cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package *
3333

3434
write-ghc-environment-files: never
3535

36-
index-state: 2021-09-06T12:12:22Z
36+
index-state: 2021-09-16T07:00:23Z
3737

3838
constraints:
3939
hyphenation +embed

Diff for: ‎docs/contributing/contributing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ If you are using nix 2.4 style command (enabled by `experimental-features = nix-
5050
you can use `nix develop` instead of `nix-shell` to enter the development shell. To enter the shell with specific GHC versions:
5151

5252
* `nix develop` or `nix develop .#haskell-language-server-dev` - default GHC version
53-
* `nix develop .#haskell-language-server-8104-dev` - GHC 8.10.4
53+
* `nix develop .#haskell-language-server-8107-dev` - GHC 8.10.7
5454
* `nix develop .#haskell-language-server-884-dev` - GHC 8.8.4
5555
* `nix develop .#haskell-language-server-901-dev` - GHC 9.0.1
5656

@@ -59,7 +59,7 @@ If you are looking for a Nix expression to create haskell-language-server binari
5959
To create binaries:
6060

6161
* `nix build` or `nix build .#haskell-language-server` - default GHC version
62-
* `nix build .#haskell-language-server-8104` - GHC 8.10.4
62+
* `nix build .#haskell-language-server-8107` - GHC 8.10.7
6363
* `nix build .#haskell-language-server-884` - GHC 8.8.4
6464
* `nix build .#haskell-language-server-901` - GHC 9.0.1
6565

Diff for: ‎docs/installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,6 @@ Homebrew users can install `haskell-language-server` using the following command
215215
brew install haskell-language-server
216216
```
217217

218-
This formula contains HLS binaries compiled with GHC versions available via Homebrew; at the moment those are: 8.6.5, 8.8.4, 8.10.4.
218+
This formula contains HLS binaries compiled with GHC versions available via Homebrew; at the moment those are: 8.6.5, 8.8.4, 8.10.7.
219219

220220
You need to provide your own GHC/Cabal/Stack as required by your project, possibly via Homebrew.

Diff for: ‎ghcide/docs/Setup.md

-145
This file was deleted.

Diff for: ‎ghcide/ghcide.cabal

+1-1
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.4 || == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
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
1717
extra-source-files: README.md CHANGELOG.md
1818
test/data/**/*.project
1919
test/data/**/*.cabal

Diff for: ‎haskell-language-server.cabal

+1-1
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.4 || == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 || == 8.10.6
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
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md

Diff for: ‎plugins/hls-hlint-plugin/hls-hlint-plugin.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ library
8585
else
8686
build-depends:
8787
, ghc
88-
, ghc-lib ^>=8.10.4.20210206
88+
, ghc-lib ^>=8.10.7.20210828
8989
, ghc-lib-parser-ex ^>=8.10
9090

9191
cpp-options: -DHLINT_ON_GHC_LIB

0 commit comments

Comments
 (0)