Skip to content

Commit e9327e4

Browse files
committed
enable 9.2 in CI
1 parent c233569 commit e9327e4

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

.github/workflows/build.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.8.4', '8.6.5']
20+
ghc: ['9.2.1', '9.0.1', '8.10.7', '8.10.6', '8.8.4', '8.6.5']
2121
os: [ubuntu-18.04, macOS-latest, windows-latest]
2222
cabal: ['3.6']
2323

@@ -43,9 +43,12 @@ jobs:
4343
echo -e 'package blaze-textual\n flags: +integer-simple' >> cabal.project.local
4444
fi
4545
46-
- name: Use modified cabal.project for ghc9
46+
- name: Use modified cabal.project for ghc9.0
4747
if: ${{ matrix.ghc == '9.0.1' }}
4848
run: cp cabal-ghc901.project cabal.project
49+
- name: Use modified cabal.project for ghc9.2
50+
if: ${{ matrix.ghc == '9.2.1' }}
51+
run: cp cabal-ghc921.project cabal.project
4952

5053
- name: Shorten binary names
5154
run: |

.github/workflows/caching.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
strategy:
6262
fail-fast: false
6363
matrix:
64-
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.6.5"]
64+
ghc: ["9.2.1", "9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.6.5"]
6565
os: [ubuntu-latest, macOS-latest, windows-latest]
6666
cabal: ['3.6']
6767

.github/workflows/hackage.yml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
"hls-call-hierarchy-plugin", "hls-alternate-number-format-plugin",
2929
"hls-qualify-imported-names-plugin",
3030
"haskell-language-server"]
31-
# Uncomment 9.0.1 when ghcide is buildable
3231
ghc: [ "9.0.1",
3332
"8.10.7",
3433
"8.8.4",

.github/workflows/test.yml

+13-9
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.6.5"]
43+
ghc: ["9.2.1", "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:
@@ -96,6 +96,10 @@ jobs:
9696
name: (GHC 9.0.1) Use modified `cabal.project`
9797
run: |
9898
cp cabal-ghc901.project cabal.project
99+
- if: matrix.ghc == '9.2.1'
100+
name: (GHC 9.2.1) Use modified `cabal.project`
101+
run: |
102+
cp cabal-ghc921.project cabal.project
99103
- if: runner.os == 'Windows' && matrix.ghc == '8.8.4'
100104
name: (Windows,GHC 8.8) Modify `cabal.project` to workaround segfaults
101105
run: |
@@ -188,12 +192,12 @@ jobs:
188192

189193
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
190194

191-
- if: matrix.test && matrix.ghc != '9.0.1'
195+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.2.1'
192196
name: Test hls-brittany-plugin
193197
run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
194198

195199
- if: matrix.test
196-
name: Test hls-class-plugin
200+
name: Test hls-class-plugin && matrix.ghc != '9.2.1'
197201
run: cabal test hls-class-plugin --test-options="$TEST_OPTS" || cabal test hls-class-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="$TEST_OPTS"
198202

199203
- if: matrix.test
@@ -204,23 +208,23 @@ jobs:
204208
name: Test hls-haddock-comments-plugin
205209
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
206210

207-
- if: matrix.test
211+
- if: matrix.test && matrix.ghc != '9.2.1'
208212
name: Test hls-splice-plugin
209213
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
210214

211-
- if: matrix.test && matrix.ghc != '9.0.1'
215+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.2.1'
212216
name: Test hls-stylish-haskell-plugin
213217
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
214218

215-
- if: matrix.test
219+
- if: matrix.test && matrix.ghc != '9.2.1'
216220
name: Test hls-ormolu-plugin
217221
run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
218222

219-
- if: matrix.test
223+
- if: matrix.test && matrix.ghc != '9.2.1'
220224
name: Test hls-fourmolu-plugin
221225
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
222226

223-
- if: matrix.test && matrix.ghc != '9.0.1' && !(matrix.os == 'ubuntu-latest' && matrix.ghc == '8.6.5')
227+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.2.1' && !(matrix.os == 'ubuntu-latest' && matrix.ghc == '8.6.5')
224228
name: Test hls-tactics-plugin test suite
225229
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
226230

@@ -240,7 +244,7 @@ jobs:
240244
name: Test hls-rename-plugin test suite
241245
run: cabal test hls-rename-plugin --test-options="$TEST_OPTS" || cabal test hls-rename-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-rename-plugin --test-options="$TEST_OPTS"
242246

243-
- if: matrix.test
247+
- if: matrix.test && matrix.ghc != '9.2.1'
244248
name: Test hls-hlint-plugin test suite
245249
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
246250

0 commit comments

Comments
 (0)