Skip to content

Commit 63fa768

Browse files
committed
Try using 9.6.1 for CI
1 parent 1fd6399 commit 63fa768

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

.github/actions/setup-build/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ runs:
3131
sudo chown -R $USER /usr/local/.ghcup
3232
shell: bash
3333

34-
- uses: FinleyMcIlwaine/actions/setup@4a3a6eafc25bf77dff3e127437ac51e63b5d812b
34+
- uses: haskell/actions/setup@2.3.5
3535
id: HaskEnvSetup
3636
with:
3737
ghc-version : ${{ inputs.ghc }}
3838
cabal-version: ${{ inputs.cabal }}
3939
enable-stack: false
40-
ghcup-release-channel: "https://github.com/raw/haskell/ghcup-metadata/eadf9b61badc7bd5b6abf3f80975785f7e9b5052/ghcup-prereleases-0.0.7.yaml"
4140

4241
- if: inputs.os == 'Windows'
4342
name: (Windows) Platform config
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[ "9.6.0.20230302", "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ]
1+
[ "9.6.1", "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ]

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
name: Test hls-refactor-plugin
142142
run: cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refactor-plugin --test-options="$TEST_OPTS"
143143

144-
- if: matrix.test && matrix.ghc != '9.6.0.20230302'
144+
- if: matrix.test && matrix.ghc != '9.6.1'
145145
name: Test hls-floskell-plugin
146146
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
147147

@@ -157,27 +157,27 @@ jobs:
157157
name: Test hls-eval-plugin
158158
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"
159159

160-
- if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.0.20230302'
160+
- if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
161161
name: Test hls-haddock-comments-plugin
162162
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"
163163

164164
- if: matrix.test
165165
name: Test hls-splice-plugin
166166
run: 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"
167167

168-
- if: matrix.test && matrix.ghc != '9.6.0.20230302'
168+
- if: matrix.test && matrix.ghc != '9.6.1'
169169
name: Test hls-stylish-haskell-plugin
170170
run: 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"
171171

172-
- if: matrix.test && matrix.ghc != '9.6.0.20230302'
172+
- if: matrix.test && matrix.ghc != '9.6.1'
173173
name: Test hls-ormolu-plugin
174174
run: 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"
175175

176-
- if: matrix.test && matrix.ghc != '9.6.0.20230302'
176+
- if: matrix.test && matrix.ghc != '9.6.1'
177177
name: Test hls-fourmolu-plugin
178178
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"
179179

180-
- if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.0.20230302'
180+
- if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
181181
name: Test hls-tactics-plugin test suite
182182
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"
183183

@@ -197,11 +197,11 @@ jobs:
197197
name: Test hls-rename-plugin test suite
198198
run: 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"
199199

200-
- if: matrix.test && matrix.ghc != '9.6.0.20230302'
200+
- if: matrix.test && matrix.ghc != '9.6.1'
201201
name: Test hls-hlint-plugin test suite
202202
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"
203203

204-
- if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.0.20230302'
204+
- if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
205205
name: Test hls-stan-plugin test suite
206206
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"
207207

0 commit comments

Comments
 (0)