Skip to content

Commit 32cd57d

Browse files
jneirajneira
authored
Support for ghc-8.10.6 (#2109)
* Support for ghc-8.10.6 * Always miss this one * Update tested-with .cabal field * Pin optparse-applicative for stylish-haskell * Add needed extra-deps
1 parent d7a745e commit 32cd57d

File tree

7 files changed

+117
-10
lines changed

7 files changed

+117
-10
lines changed

‎.circleci/config.yml

+6
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ jobs:
8686
- STACK_FILE: "stack-8.10.5.yaml"
8787
<<: *defaults
8888

89+
ghc-8.10.6:
90+
environment:
91+
- STACK_FILE: "stack-8.10.6.yaml"
92+
<<: *defaults
93+
8994
ghc-9.0.1:
9095
environment:
9196
- STACK_FILE: "stack-9.0.1.yaml"
@@ -109,5 +114,6 @@ workflows:
109114
- ghc-8.10.3
110115
- ghc-8.10.4
111116
- ghc-8.10.5
117+
- ghc-8.10.6
112118
- ghc-9.0.1
113119
- ghc-default

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
ghc: ['9.0.1', '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.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']
2020
os: [ubuntu-18.04, macOS-latest, windows-latest]
2121
exclude:
2222
- os: windows-latest

‎.github/workflows/test.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333
strategy:
3434
fail-fast: true
3535
matrix:
36-
ghc: ["9.0.1", "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.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"]
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.5'
44+
ghc: '8.10.6'
4545
test: true
4646
- os: ubuntu-latest
4747
ghc: '8.8.4'
@@ -53,12 +53,14 @@ jobs:
5353
ghc: '9.0.1'
5454
test: true
5555
- os: windows-latest
56-
ghc: '8.10.5'
56+
ghc: '8.10.6'
5757
test: true
5858
- os: windows-latest
5959
ghc: '8.6.5'
6060
test: true
6161
# only build rest of supported ghc versions for windows
62+
- os: windows-latest
63+
ghc: '8.10.5'
6264
- os: windows-latest
6365
ghc: '8.10.4'
6466
- os: windows-latest

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

‎stack-8.10.5.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ ghc-options:
3333
"$everything": -haddock
3434

3535
extra-deps:
36+
- ansi-terminal-0.10.3
3637
- apply-refact-0.9.3.0
3738
- brittany-0.13.1.2
3839
- Cabal-3.0.2.0
@@ -50,6 +51,8 @@ extra-deps:
5051
- implicit-hie-cradle-0.3.0.5
5152
- implicit-hie-0.1.2.6
5253
- monad-dijkstra-0.1.1.2
54+
# For stylish-haskell-0.12.2.0
55+
- optparse-applicative-0.15.1.0
5356
- refinery-0.4.0.0
5457
- retrie-0.1.1.1
5558
- stylish-haskell-0.12.2.0
@@ -94,10 +97,6 @@ flags:
9497
hyphenation:
9598
embed: true
9699

97-
98-
# Because of implicit-hie-cradle-0.3.0.2 and stylish-haskell-0.12.2.0
99-
allow-newer: true
100-
101100
nix:
102101
packages: [ icu libcxx zlib ]
103102

‎stack-8.10.6.yaml

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
resolver: nightly-2021-06-14
2+
compiler: ghc-8.10.6
3+
4+
packages:
5+
- .
6+
- ./hie-compat
7+
- ./hls-graph
8+
- ./ghcide/
9+
- ./hls-plugin-api
10+
- ./hls-test-utils
11+
# - ./shake-bench
12+
- ./plugins/hls-call-hierarchy-plugin
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: hsyl20/ghc-api-compat
43+
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
44+
- ghc-check-0.5.0.4
45+
- ghc-exactprint-0.6.4
46+
- ghc-source-gen-0.4.1.0
47+
- heapsize-0.3.0
48+
- implicit-hie-cradle-0.3.0.5
49+
- implicit-hie-0.1.2.6
50+
- monad-dijkstra-0.1.1.2
51+
# For stylish-haskell-0.12.2.0
52+
- optparse-applicative-0.15.1.0
53+
- refinery-0.4.0.0
54+
- retrie-1.0.0.0
55+
- stylish-haskell-0.12.2.0
56+
- semigroups-0.18.5
57+
- temporary-1.2.1.1
58+
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
59+
- bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727
60+
- hiedb-0.4.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+
- lsp-1.2.0.1
68+
- lsp-types-1.3.0.1
69+
- lsp-test-0.14.0.1
70+
71+
# Enable these when supported by all formatters
72+
# - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
73+
# - ghc-lib-parser-9.0.1.20210324@sha256:fb680f78d4ab08b5d089a05bda3b84ad857e5edcc2e4ca7c188c0207d369af80
74+
# - ghc-lib-parser-ex-9.0.0.4@sha256:8282b11c3797fc8ba225b245e736cc9a0745d9c48d0f9fea7f9bffb5c9997709,3642
75+
# - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
76+
77+
configure-options:
78+
ghcide:
79+
- --disable-library-for-ghci
80+
haskell-language-server:
81+
- --disable-library-for-ghci
82+
heapsize:
83+
- --disable-library-for-ghci
84+
85+
flags:
86+
haskell-language-server:
87+
pedantic: true
88+
retrie:
89+
BuildExecutable: false
90+
# Stack doesn't support automatic flags.
91+
# Until the formatters support ghc-lib-9, we need this flag disabled
92+
hls-hlint-plugin:
93+
hlint33: false
94+
hyphenation:
95+
embed: true
96+
97+
nix:
98+
packages: [ icu libcxx zlib ]
99+
100+
concurrent-tests: false

0 commit comments

Comments
 (0)