Skip to content

Commit 3053be1

Browse files
AilrunAilrun
committed
Add GHC 8.10.5
1 parent 0cc89d2 commit 3053be1

File tree

8 files changed

+122
-14
lines changed

8 files changed

+122
-14
lines changed

‎.circleci/config.yml

+6
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ jobs:
103103
- STACK_FILE: "stack-8.10.4.yaml"
104104
<<: *defaults
105105

106+
ghc-8.10.5:
107+
environment:
108+
- STACK_FILE: "stack-8.10.5.yaml"
109+
<<: *defaults
110+
106111
ghc-9.0.1:
107112
environment:
108113
- STACK_FILE: "stack-9.0.1.yaml"
@@ -126,5 +131,6 @@ workflows:
126131
- ghc-8.10.2
127132
- ghc-8.10.3
128133
- ghc-8.10.4
134+
- ghc-8.10.5
129135
- ghc-9.0.1
130136
- ghc-default

‎.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.5']
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.5']
110110
os: [ubuntu-latest]
111111
example: ['Cabal-3.0.0.0', 'lsp-types-1.0.0.1']
112112

‎.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
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']
19+
ghc: ['8.10.5', '8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
2020
os: [ubuntu-18.04, macOS-latest, windows-latest]
2121
exclude:
2222
- os: windows-latest
@@ -113,11 +113,11 @@ jobs:
113113
path: ${{ steps.compress_server_binary.outputs.path }}
114114

115115
- name: Build Wrapper
116-
if: matrix.ghc == '8.10.4'
116+
if: matrix.ghc == '8.10.5'
117117
run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS
118118

119119
- name: Compress Wrapper Binary
120-
if: matrix.ghc == '8.10.4'
120+
if: matrix.ghc == '8.10.5'
121121
id: compress_wrapper_binary
122122
run: |
123123
HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f)
@@ -136,7 +136,7 @@ jobs:
136136
fi
137137
138138
- name: Upload Wrapper
139-
if: matrix.ghc == '8.10.4'
139+
if: matrix.ghc == '8.10.5'
140140
uses: actions/[email protected]
141141
env:
142142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -147,7 +147,7 @@ jobs:
147147
asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}
148148

149149
- uses: actions/upload-artifact@v2
150-
if: matrix.ghc == '8.10.4'
150+
if: matrix.ghc == '8.10.5'
151151
with:
152152
name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
153153
path: ${{ steps.compress_wrapper_binary.outputs.path }}

‎.github/workflows/test.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,15 @@ jobs:
3333
strategy:
3434
fail-fast: true
3535
matrix:
36-
ghc: ["9.0.1", "8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
36+
ghc: ["9.0.1", "8.10.5", "8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
3737
os: [ubuntu-latest, macOS-latest]
3838
include:
3939
# only test supported ghc major versions
4040
- os: ubuntu-latest
4141
ghc: '9.0.1'
4242
test: true
4343
- os: ubuntu-latest
44-
ghc: '8.10.4'
45-
test: true
46-
- os: windows-latest
47-
ghc: '8.10.4'
44+
ghc: '8.10.5'
4845
test: true
4946
- os: ubuntu-latest
5047
ghc: '8.8.4'
@@ -56,6 +53,10 @@ jobs:
5653
ghc: '8.6.5'
5754
test: true
5855
# only build rest of supported ghc versions for windows
56+
# Disable window test temporarily because choco does not have GHC 8.10.5 yet
57+
- os: windows-latest
58+
ghc: '8.10.5'
59+
test: true
5960
- os: windows-latest
6061
ghc: '8.10.2.2'
6162
- os: windows-latest

‎flake.nix

+3
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
pkgs.haskellPackages.ghc.version);
168168
ghc884 = pkgs.hlsHpkgs "ghc884";
169169
ghc8104 = pkgs.hlsHpkgs "ghc8104";
170+
ghc8105 = pkgs.hlsHpkgs "ghc8105";
170171
ghc901 = pkgs.hlsHpkgs "ghc901";
171172

172173
# Create a development shell of hls project
@@ -216,12 +217,14 @@
216217
haskell-language-server-dev = mkDevShell ghcDefault;
217218
haskell-language-server-884-dev = mkDevShell ghc884;
218219
haskell-language-server-8104-dev = mkDevShell ghc8104;
220+
haskell-language-server-8105-dev = mkDevShell ghc8105;
219221
haskell-language-server-901-dev = mkDevShell ghc901;
220222

221223
# hls package
222224
haskell-language-server = mkExe ghcDefault;
223225
haskell-language-server-884 = mkExe ghc884;
224226
haskell-language-server-8104 = mkExe ghc8104;
227+
haskell-language-server-8105 = mkExe ghc8105;
225228
haskell-language-server-901 = mkExe ghc901;
226229
};
227230

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

‎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.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
17+
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 || == 8.10.5
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md

‎stack-8.10.5.yaml

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# Fixme once GHC-8.10.5 LTS is out
2+
resolver: nightly-2021-06-01
3+
compiler: ghc-8.10.5
4+
5+
packages:
6+
- .
7+
- ./hie-compat
8+
- ./hls-graph
9+
- ./ghcide/
10+
- ./hls-plugin-api
11+
- ./hls-test-utils
12+
# - ./shake-bench
13+
- ./plugins/hls-class-plugin
14+
- ./plugins/hls-haddock-comments-plugin
15+
- ./plugins/hls-eval-plugin
16+
- ./plugins/hls-explicit-imports-plugin
17+
- ./plugins/hls-refine-imports-plugin
18+
- ./plugins/hls-hlint-plugin
19+
- ./plugins/hls-retrie-plugin
20+
- ./plugins/hls-splice-plugin
21+
- ./plugins/hls-tactics-plugin
22+
- ./plugins/hls-brittany-plugin
23+
- ./plugins/hls-stylish-haskell-plugin
24+
- ./plugins/hls-floskell-plugin
25+
- ./plugins/hls-fourmolu-plugin
26+
- ./plugins/hls-pragmas-plugin
27+
- ./plugins/hls-module-name-plugin
28+
- ./plugins/hls-ormolu-plugin
29+
30+
ghc-options:
31+
"$everything": -haddock
32+
33+
extra-deps:
34+
- apply-refact-0.9.3.0
35+
- brittany-0.13.1.2
36+
- Cabal-3.0.2.0
37+
- clock-0.7.2
38+
- data-tree-print-0.1.0.2@rev:2
39+
- floskell-0.10.5
40+
- fourmolu-0.3.0.0
41+
- # ghc-api-compat-8.6
42+
github: pepeiborra/ghc-api-compat
43+
commit: 6546157c7a7e1d323d4bf961768804119450c1aa
44+
- ghc-check-0.5.0.4
45+
- ghc-exactprint-0.6.4
46+
- heapsize-0.3.0
47+
- implicit-hie-cradle-0.3.0.2
48+
- implicit-hie-0.1.2.5
49+
- monad-dijkstra-0.1.1.2
50+
- refinery-0.3.0.0
51+
- retrie-1.0.0.0
52+
- stylish-haskell-0.12.2.0
53+
- semigroups-0.18.5
54+
- temporary-1.2.1.1
55+
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
56+
- bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727
57+
- hiedb-0.3.0.1
58+
- lsp-1.2.0.0
59+
- lsp-types-1.2.0.0
60+
- lsp-test-0.14.0.0
61+
- dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
62+
- dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
63+
- dependent-sum-template-0.1.0.3@sha256:0bbbacdfbd3abf2a15aaf0cf2c27e5bdd159b519441fec39e1e6f2f54424adde,1682
64+
- constraints-extras-0.3.1.0
65+
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
66+
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
67+
68+
# Enable these when supported by all formatters
69+
# - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
70+
# - ghc-lib-parser-9.0.1.20210324@sha256:fb680f78d4ab08b5d089a05bda3b84ad857e5edcc2e4ca7c188c0207d369af80
71+
# - ghc-lib-parser-ex-9.0.0.4@sha256:8282b11c3797fc8ba225b245e736cc9a0745d9c48d0f9fea7f9bffb5c9997709,3642
72+
# - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
73+
74+
configure-options:
75+
ghcide:
76+
- --disable-library-for-ghci
77+
haskell-language-server:
78+
- --disable-library-for-ghci
79+
heapsize:
80+
- --disable-library-for-ghci
81+
82+
flags:
83+
haskell-language-server:
84+
pedantic: true
85+
retrie:
86+
BuildExecutable: false
87+
# Stack doesn't support automatic flags.
88+
# Until the formatters support ghc-lib-9, we need this flag disabled
89+
hls-hlint-plugin:
90+
hlint33: false
91+
92+
# Because of implicit-hie-cradle-0.3.0.2 and stylish-haskell-0.12.2.0
93+
allow-newer: true
94+
95+
nix:
96+
packages: [ icu libcxx zlib ]
97+
98+
concurrent-tests: false

0 commit comments

Comments
 (0)