Skip to content

Commit 9cb3485

Browse files
fendormichaelpjpepeiborra
authored
Add CI flows for GHC 9.2.5 (#3376)
* Add CI flows for GHC 9.2.5 * Prefer GHC 9.2.5 over 9.2.4 * Update list of tested-with GHC versions, as we only *test* 9.2.5 * Add GHC 9.2.5 as a supported GHC version * Update comment in cabal-plugin about disabled test-case * Disable GHC 9.2.5 on windows * Fix CI for windows * Run tests on windows for GHC 9.2.4 Co-authored-by: Michael Peyton Jones <[email protected]> Co-authored-by: Pepe Iborra <[email protected]>
1 parent 47e04f8 commit 9cb3485

File tree

9 files changed

+28
-15
lines changed

9 files changed

+28
-15
lines changed

‎.github/workflows/bench.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
ghc: ['8.10.7', '9.2.4']
49+
ghc: ['8.10.7', '9.2.5']
5050
os: [ubuntu-latest]
5151

5252
# This code is fitted to the strategy: assumes Linux is used ... etc,
@@ -104,7 +104,7 @@ jobs:
104104
strategy:
105105
fail-fast: false
106106
matrix:
107-
ghc: ['8.10.7', '9.2.4']
107+
ghc: ['8.10.7', '9.2.5']
108108
os: [ubuntu-latest]
109109
cabal: ['3.6']
110110
example: ['cabal', 'lsp-types']

‎.github/workflows/caching.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
# specified in 'test.yml'
8585
ghc: [ "9.4.2"
8686
, "9.4.1"
87+
, "9.2.5"
8788
, "9.2.4"
8889
, "9.2.3"
8990
, "9.0.2"
@@ -96,6 +97,10 @@ jobs:
9697
exclude:
9798
- os: windows-latest
9899
ghc: '9.4.1'
100+
# Exclude until https://github.com/haskell/actions/issues/129
101+
# is resolved.
102+
- os: windows-latest
103+
ghc: '9.2.5'
99104

100105
steps:
101106
- uses: actions/checkout@v3

‎.github/workflows/flags.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
fail-fast: true
4646
matrix:
47-
ghc: [ "9.2.4"
47+
ghc: [ "9.2.5"
4848
, "9.0.2"
4949
, "8.10.7"
5050
]
@@ -65,8 +65,8 @@ jobs:
6565
- name: Build `ghcide` with flags
6666
run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
6767

68-
# we have to clean up warnings for 9.0 and 9.2 before enable -WAll
69-
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4'
68+
# we have to clean up warnings for 9.0 and 9.2 before enable -Wall
69+
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5'
7070
name: Build with pedantic (-WError)
7171
run: cabal v2-build --flags="pedantic"
7272

‎.github/workflows/test.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
matrix:
6363
ghc: [ "9.4.2"
6464
, "9.4.1"
65+
, "9.2.5"
6566
, "9.2.4"
6667
, "9.2.3"
6768
, "9.0.2"
@@ -77,14 +78,18 @@ jobs:
7778
exclude:
7879
- os: windows-latest
7980
ghc: '9.4.1'
81+
# Exclude until https://github.com/haskell/actions/issues/129
82+
# is resolved.
83+
- os: windows-latest
84+
ghc: '9.2.5'
8085
# Mark which GHC versions on which platform we want to test.
8186
include:
8287
# only test supported ghc major versions
8388
- os: ubuntu-latest
8489
ghc: '9.4.2'
8590
test: true
8691
- os: ubuntu-latest
87-
ghc: '9.2.4'
92+
ghc: '9.2.5'
8893
test: true
8994
- os: ubuntu-latest
9095
ghc: '9.0.2'
@@ -95,6 +100,8 @@ jobs:
95100
- os: windows-latest
96101
ghc: '9.4.2'
97102
test: true
103+
# Test on 9.2.4 until https://github.com/haskell/actions/issues/129
104+
# is resolved. Then switch to 9.2.5
98105
- os: windows-latest
99106
ghc: '9.2.4'
100107
test: true
@@ -158,7 +165,7 @@ jobs:
158165
HLS_WRAPPER_TEST_EXE: hls-wrapper
159166
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
160167

161-
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
168+
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2'
162169
name: Test hls-brittany-plugin
163170
run: 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"
164171

@@ -182,7 +189,7 @@ jobs:
182189
name: Test hls-eval-plugin
183190
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
184191

185-
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
192+
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2'
186193
name: Test hls-haddock-comments-plugin
187194
run: 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"
188195

@@ -202,7 +209,7 @@ jobs:
202209
name: Test hls-fourmolu-plugin
203210
run: 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"
204211

205-
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
212+
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2'
206213
name: Test hls-tactics-plugin test suite
207214
run: 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"
208215

@@ -226,7 +233,7 @@ jobs:
226233
name: Test hls-hlint-plugin test suite
227234
run: 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"
228235

229-
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
236+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2'
230237
name: Test hls-stan-plugin test suite
231238
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stan-plugin --test-options="$TEST_OPTS"
232239

‎docs/support/ghc-version-support.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Support status (see the support policy below for more details):
1919
|--------------|------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
2020
| 9.4.2 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
2121
| 9.4.1 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
22+
| 9.2.5 | unreleased | full support |
23+
2224
| 9.2.4 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
2325
| 9.2.3 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
2426
| 9.2.(1,2) | [1.7.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0) | deprecated |

‎ghcide-bench/ghcide-bench.cabal‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ synopsis: An LSP client for running performance experiments on HLS
1212
description: An LSP client for running performance experiments on HLS
1313
homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
1414
bug-reports: https://github.com/haskell/haskell-language-server/issues
15-
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
15+
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.5
1616

1717
source-repository head
1818
type: git
@@ -137,4 +137,3 @@ test-suite test
137137
TupleSections
138138
TypeApplications
139139
ViewPatterns
140-

‎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.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
16+
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.5
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.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
17+
tested-with: GHC == 8.10.7 || == 9.0.2 || ==9.2.5
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md

‎plugins/hls-cabal-plugin/test/Main.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pluginTests = testGroup "Plugin Tests"
9797
expectNoMoreDiagnostics 1 hsDoc "typechecking"
9898
cabalDoc <- openDoc "simple-cabal.cabal" "cabal"
9999
expectNoMoreDiagnostics 1 cabalDoc "parsing"
100-
, ignoreTestBecause "Testcase is flaky for certain GHC versions (e.g. 9.2.4). See #3333 for details." $ do
100+
, ignoreTestBecause "Testcase is flaky for certain GHC versions (e.g. 9.2.5). See #3333 for details." $ do
101101
runCabalTestCaseSession "Diagnostics in .hs files from invalid .cabal file" "simple-cabal" $ do
102102
hsDoc <- openDoc "A.hs" "haskell"
103103
expectNoMoreDiagnostics 1 hsDoc "typechecking"

0 commit comments

Comments
 (0)