Skip to content

Commit 8176fb8

Browse files
Simplify selection of GHCs to build on (#3633)
* Simplify selection of GHCs to build on The haskell setup action supports using the major version, and then it will select the latest minor version. That should be fine for us - we don't have to change anything to get new minor versions, and it's not too much of a problem to get new minor versions implicitly, since they should be very unlikely to break things. * update exclusions * Fixup * More --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 79747f4 commit 8176fb8

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

.github/workflows/bench.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
ghc:
50-
- '8.10.7'
51-
- '9.2.7'
50+
- '8.10'
51+
- '9.2'
5252
os:
5353
- ubuntu-latest
5454

@@ -115,9 +115,9 @@ jobs:
115115
strategy:
116116
fail-fast: false
117117
matrix:
118-
ghc: ['8.10.7', '9.2.7']
118+
ghc: ['8.10', '9.2']
119119
os: [ubuntu-latest]
120-
cabal: ['3.6']
120+
cabal: ['3.10']
121121
example: ['cabal', 'lsp-types']
122122

123123
steps:

.github/workflows/caching.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
# Fetching from github cache is faster than doing it from hackage
103103
# Sources does not change per ghc and ghc version son only doing it
104104
# for one matrix job (it is arbitrary)
105-
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10.7'
105+
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10'
106106
name: Download sources
107107
run: |
108108
cabal $cabalBuild --only-download --enable-benchmarks --enable-tests
@@ -117,7 +117,7 @@ jobs:
117117
# We build ghcide with benchs and test enabled to include its dependencies in the cache
118118
# (including shake-bench)
119119
# Only for the same ghc and os used in the bench workflow, so we save cache space
120-
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10.7'
120+
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10'
121121
name: Build ghcide benchmark
122122
run: |
123123
cabal $cabalBuild ghcide --enable-benchmarks --enable-tests

.github/workflows/flags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
7777

7878
# we have to clean up warnings for 9.0 and 9.2 before enable -Wall
79-
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7'
79+
- if: matrix.ghc != '9.0' && matrix.ghc != '9.2'
8080
name: Build with pedantic (-WError)
8181
run: cabal v2-build --flags="pedantic"
8282

.github/workflows/hackage.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
"hls-qualify-imported-names-plugin", "hls-code-range-plugin",
4141
"hls-cabal-fmt-plugin",
4242
"haskell-language-server"]
43-
ghc: [ "9.0.2"
44-
, "8.10.7"
43+
ghc: [ "9.0"
44+
, "8.10"
4545
]
4646
exclude:
47-
- ghc: "9.0.2"
47+
- ghc: "9.0"
4848
package: "hls-stylish-haskell-plugin"
4949

5050
steps:
@@ -108,7 +108,7 @@ jobs:
108108
# The solver takes in account all project packages, even if they are not gonna be effectively built
109109
# (like stylish-haskell for ghc-9.0)
110110
- name: "Add temporary needed allow-newer for ghc-9.0"
111-
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '9.0.2'
111+
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '9.0'
112112
run: |
113113
cd $(ls -d ./incoming/${{ matrix.package }}-*)
114114
# For stylish-haskell
@@ -133,7 +133,7 @@ jobs:
133133
cabal haddock --haddock-for-hackage
134134
135135
- name: "Upload package dist tarball"
136-
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '8.10.7'
136+
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '8.10'
137137
uses: actions/upload-artifact@v3
138138
with:
139139
name: ${{ matrix.package }}

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: ./.github/actions/setup-build
2828
with:
2929
# select a stable GHC version
30-
ghc: 9.2.7
30+
ghc: 9.2
3131
os: ${{ runner.os }}
3232
shorten-hls: false
3333

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[ "9.6.1", "9.4.5" , "9.2.7" , "9.0.2" , "8.10.7" ]
1+
[ "9.6", "9.4" , "9.2" , "9.0" , "8.10" ]

.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
name: Test hls-refactor-plugin
139139
run: cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || cabal test hls-refactor-plugin --test-options="$TEST_OPTS"
140140

141-
- if: matrix.test && matrix.ghc != '9.6.1'
141+
- if: matrix.test && matrix.ghc != '9.6'
142142
name: Test hls-floskell-plugin
143143
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
144144

@@ -154,27 +154,27 @@ jobs:
154154
name: Test hls-eval-plugin
155155
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS"
156156

157-
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.5' && matrix.ghc != '9.6.1'
157+
- if: matrix.test && matrix.ghc != '9.2' && matrix.ghc != '9.4' && matrix.ghc != '9.6'
158158
name: Test hls-haddock-comments-plugin
159159
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
160160

161161
- if: matrix.test
162162
name: Test hls-splice-plugin
163163
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS"
164164

165-
- if: matrix.test && matrix.ghc != '9.6.1'
165+
- if: matrix.test && matrix.ghc != '9.6'
166166
name: Test hls-stylish-haskell-plugin
167167
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
168168

169-
- if: matrix.test && matrix.ghc != '9.6.1'
169+
- if: matrix.test && matrix.ghc != '9.6'
170170
name: Test hls-ormolu-plugin
171171
run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
172172

173-
- if: matrix.test && matrix.ghc != '9.6.1'
173+
- if: matrix.test && matrix.ghc != '9.6'
174174
name: Test hls-fourmolu-plugin
175175
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
176176

177-
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.5' && matrix.ghc != '9.6.1'
177+
- if: matrix.test && matrix.ghc != '9.2' && matrix.ghc != '9.4' && matrix.ghc != '9.6'
178178
name: Test hls-tactics-plugin test suite
179179
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
180180

@@ -194,11 +194,11 @@ jobs:
194194
name: Test hls-rename-plugin test suite
195195
run: cabal test hls-rename-plugin --test-options="$TEST_OPTS" || cabal test hls-rename-plugin --test-options="$TEST_OPTS"
196196

197-
- if: matrix.test && matrix.ghc != '9.6.1'
197+
- if: matrix.test && matrix.ghc != '9.6'
198198
name: Test hls-hlint-plugin test suite
199199
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
200200

201-
- if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.5' && matrix.ghc != '9.6.1'
201+
- if: matrix.test && matrix.ghc != '9.0' && matrix.ghc != '9.2' && matrix.ghc != '9.4' && matrix.ghc != '9.6'
202202
name: Test hls-stan-plugin test suite
203203
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-stan-plugin --test-options="$TEST_OPTS"
204204

@@ -235,7 +235,7 @@ jobs:
235235
run: cabal test hls-explicit-record-fields-plugin --test-options="$TEST_OPTS" || cabal test hls-explicit-record-fields-plugin --test-options="$TEST_OPTS"
236236

237237
## version needs to be limited since the tests depend on cabal-fmt which only builds using specific ghc versions
238-
- if: matrix.test && matrix.ghc == '8.10.7'
238+
- if: matrix.test && matrix.ghc == '8.10'
239239
name: Test hls-cabal-fmt-plugin test suite
240240
run: cabal test hls-cabal-fmt-plugin --flag=isolateTests --test-options="$TEST_OPTS" || cabal test hls-cabal-fmt-plugin --flag=isolateTests --test-options="$TEST_OPTS"
241241

@@ -247,7 +247,7 @@ jobs:
247247
name: Test hls-retrie-plugin test suite
248248
run: cabal test hls-retrie-plugin --test-options="$TEST_OPTS" || cabal test hls-retrie-plugin --test-options="$TEST_OPTS"
249249

250-
- if: matrix.test && matrix.ghc != '8.10.7' && matrix.ghc != '9.0.2'
250+
- if: matrix.test && matrix.ghc != '8.10' && matrix.ghc != '9.0'
251251
name: Test hls-overloaded-record-dot-plugin test suite
252252
run: cabal test hls-overloaded-record-dot-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-overloaded-record-dot-plugin --test-options="$TEST_OPTS"
253253

0 commit comments

Comments
 (0)