Skip to content

Commit aa36bde

Browse files
AilrunAilrun
committed
Revert "Remove GHC 8.10.2"
This reverts commit b85b029.
1 parent acc6300 commit aa36bde

File tree

6 files changed

+110
-4
lines changed

6 files changed

+110
-4
lines changed

‎.circleci/config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ jobs:
8888
- STACK_FILE: "stack-8.8.4.yaml"
8989
<<: *defaults
9090

91+
ghc-8.10.2:
92+
environment:
93+
- STACK_FILE: "stack-8.10.2.yaml"
94+
<<: *defaults
95+
9196
ghc-8.10.3:
9297
environment:
9398
- STACK_FILE: "stack-8.10.3.yaml"
@@ -123,6 +128,7 @@ workflows:
123128
- ghc-8.8.2
124129
- ghc-8.8.3
125130
- ghc-8.8.4
131+
- ghc-8.10.2
126132
- ghc-8.10.3
127133
- ghc-8.10.4
128134
- ghc-8.10.5

‎.github/workflows/build.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
ghc: ['8.10.5', '8.10.4', '8.10.3', '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:
22+
- os: windows-latest
23+
ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
2224
- os: windows-latest
2325
ghc: '8.8.4' # also fails due to segfault :(
2426
- os: windows-latest
@@ -27,6 +29,9 @@ jobs:
2729
ghc: '8.8.2' # fails due to error with Cabal
2830
- os: macOS-latest
2931
ghc: '8.10.5' # https://gitlab.haskell.org/ghc/ghc/-/issues/19968
32+
include:
33+
- os: windows-latest
34+
ghc: '8.10.2.2' # only available for windows and choco
3035

3136
steps:
3237
- uses: actions/checkout@v2
@@ -51,6 +56,7 @@ jobs:
5156
GHC_VER: ${{ matrix.ghc }}
5257
run: |
5358
echo "EXE_EXT=.exe" >> $GITHUB_ENV
59+
GHC_VER=$(echo $GHC_VER | sed 's/8.10.2.2/8.10.2/g')
5460
echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
5561
5662
- name: Set some linux specific things
@@ -77,6 +83,7 @@ jobs:
7783
- name: Compress Server Binary
7884
id: compress_server_binary
7985
run: |
86+
# We normalize windows+choco ghc version 8.10.2.2
8087
HLS_BUILD=$(find dist-newstyle \( -name 'hls' -o -name 'hls.exe' \) -type f)
8188
HLS=haskell-language-server-${{env.GHC_VERSION}}
8289
mv $HLS_BUILD $HLS${{env.EXE_EXT}}

‎.github/workflows/test.yml

Lines changed: 3 additions & 1 deletion
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.5", "8.10.4", "8.10.3", "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
@@ -58,6 +58,8 @@ jobs:
5858
ghc: '8.10.4'
5959
- os: windows-latest
6060
ghc: '8.10.3'
61+
- os: windows-latest
62+
ghc: '8.10.2.2'
6163
- os: windows-latest
6264
ghc: '8.6.5'
6365
test: true

‎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.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.3 || == 8.10.4 || == 8.10.5 || == 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

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.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.3 || == 8.10.4 || == 8.10.5
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.2.yaml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
resolver: nightly-2020-12-09
2+
3+
packages:
4+
- .
5+
- ./hie-compat
6+
- ./hls-graph
7+
- ./ghcide/
8+
- ./hls-plugin-api
9+
- ./hls-test-utils
10+
# - ./shake-bench
11+
- ./plugins/hls-class-plugin
12+
- ./plugins/hls-haddock-comments-plugin
13+
- ./plugins/hls-eval-plugin
14+
- ./plugins/hls-explicit-imports-plugin
15+
- ./plugins/hls-refine-imports-plugin
16+
- ./plugins/hls-hlint-plugin
17+
- ./plugins/hls-retrie-plugin
18+
- ./plugins/hls-splice-plugin
19+
- ./plugins/hls-tactics-plugin
20+
- ./plugins/hls-brittany-plugin
21+
- ./plugins/hls-stylish-haskell-plugin
22+
- ./plugins/hls-floskell-plugin
23+
- ./plugins/hls-fourmolu-plugin
24+
- ./plugins/hls-pragmas-plugin
25+
- ./plugins/hls-module-name-plugin
26+
- ./plugins/hls-ormolu-plugin
27+
28+
ghc-options:
29+
"$everything": -haddock
30+
31+
extra-deps:
32+
- apply-refact-0.9.3.0
33+
- brittany-0.13.1.2
34+
- Cabal-3.0.2.0
35+
- clock-0.7.2
36+
- data-tree-print-0.1.0.2@rev:2
37+
- floskell-0.10.4
38+
- fourmolu-0.3.0.0
39+
- # ghc-api-compat-8.6
40+
github: hsyl20/ghc-api-compat
41+
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
42+
- ghc-check-0.5.0.4
43+
- ghc-exactprint-0.6.4
44+
- ghc-lib-8.10.4.20210206
45+
- ghc-lib-parser-8.10.4.20210206
46+
- lsp-1.2.0.0
47+
- lsp-types-1.2.0.0
48+
- lsp-test-0.14.0.0
49+
- heapsize-0.3.0
50+
- hie-bios-0.7.5
51+
- implicit-hie-cradle-0.3.0.2
52+
- implicit-hie-0.1.2.5
53+
- monad-dijkstra-0.1.1.2
54+
- refinery-0.3.0.0
55+
- retrie-0.1.1.1
56+
- shake-0.19.4
57+
- stylish-haskell-0.12.2.0
58+
- semigroups-0.18.5
59+
- temporary-1.2.1.1
60+
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
61+
- bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727
62+
- hiedb-0.3.0.1
63+
- dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
64+
- dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
65+
- dependent-sum-template-0.1.0.3@sha256:0bbbacdfbd3abf2a15aaf0cf2c27e5bdd159b519441fec39e1e6f2f54424adde,1682
66+
- constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
67+
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
68+
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
69+
70+
configure-options:
71+
ghcide:
72+
- --disable-library-for-ghci
73+
haskell-language-server:
74+
- --disable-library-for-ghci
75+
heapsize:
76+
- --disable-library-for-ghci
77+
78+
flags:
79+
haskell-language-server:
80+
pedantic: true
81+
retrie:
82+
BuildExecutable: false
83+
# Stack doesn't support automatic flags.
84+
# Until the formatters support ghc-lib-9, we need this flag disabled
85+
hls-hlint-plugin:
86+
hlint33: false
87+
88+
nix:
89+
packages: [icu libcxx zlib]
90+
91+
concurrent-tests: false

0 commit comments

Comments
 (0)