Skip to content

Commit 313e36a

Browse files
committed
Revert free-disk-space workaround
1 parent fbd03f8 commit 313e36a

File tree

1 file changed

+37
-54
lines changed

1 file changed

+37
-54
lines changed

.github/workflows/test.yml

Lines changed: 37 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- ubuntu-latest
7575
- macOS-latest
7676
- windows-latest
77-
test:
77+
test:
7878
- true
7979
- false
8080
exclude:
@@ -93,23 +93,6 @@ jobs:
9393
test: false
9494

9595
steps:
96-
- if: matrix.test && matrix.os == 'ubuntu-latest'
97-
name: Free Disk Space (Ubuntu)
98-
uses: jlumbroso/free-disk-space@v1.3.1
99-
with:
100-
# this might remove tools that are actually needed,
101-
# if set to "true" but frees about 6 GB
102-
tool-cache: false
103-
104-
# all of these default to true, but feel free to set to
105-
# "false" if necessary for your workflow
106-
android: true
107-
dotnet: true
108-
haskell: true
109-
large-packages: true
110-
docker-images: true
111-
swap-storage: true
112-
11396
- uses: actions/checkout@v3
11497

11598
- uses: ./.github/actions/setup-build
@@ -129,139 +112,139 @@ jobs:
129112
130113
- if: matrix.test
131114
name: Test hls-graph
132-
run: cabal test hls-graph
115+
run: cabal test hls-graph
133116

134117
- if: needs.pre_job.outputs.should_skip_ghcide != 'true' && matrix.test
135118
name: Test ghcide
136119
# run the tests without parallelism to avoid running out of memory
137-
run: cabal test ghcide || cabal test ghcide
120+
run: cabal test ghcide || cabal test ghcide
138121

139122
- if: matrix.test
140123
name: Test hls-plugin-api
141-
run: cabal test hls-plugin-api || cabal test hls-plugin-api
124+
run: cabal test hls-plugin-api || cabal test hls-plugin-api
142125

143126
- if: matrix.test
144127
name: Test func-test suite
145128
env:
146129
HLS_TEST_EXE: hls
147130
HLS_WRAPPER_TEST_EXE: hls-wrapper
148-
run: cabal test func-test || cabal test func-test
131+
run: cabal test func-test || cabal test func-test
149132

150133
- if: matrix.test
151134
name: Test wrapper-test suite
152135
env:
153136
HLS_TEST_EXE: hls
154137
HLS_WRAPPER_TEST_EXE: hls-wrapper
155-
run: cabal test wrapper-test
138+
run: cabal test wrapper-test
156139

157140
- if: matrix.test
158141
name: Test hls-refactor-plugin
159-
run: cabal test hls-refactor-plugin-tests || cabal test hls-refactor-plugin-tests
142+
run: cabal test hls-refactor-plugin-tests || cabal test hls-refactor-plugin-tests
160143

161-
- if: matrix.test
144+
- if: matrix.test
162145
name: Test hls-floskell-plugin
163-
run: cabal test hls-floskell-plugin-tests || cabal test hls-floskell-plugin-tests
146+
run: cabal test hls-floskell-plugin-tests || cabal test hls-floskell-plugin-tests
164147

165148
- if: matrix.test
166149
name: Test hls-class-plugin
167-
run: cabal test hls-class-plugin-tests || cabal test hls-class-plugin-tests
150+
run: cabal test hls-class-plugin-tests || cabal test hls-class-plugin-tests
168151

169152
- if: matrix.test
170153
name: Test hls-pragmas-plugin
171-
run: cabal test hls-pragmas-plugin-tests || cabal test hls-pragmas-plugin-tests
154+
run: cabal test hls-pragmas-plugin-tests || cabal test hls-pragmas-plugin-tests
172155

173156
- if: matrix.test
174157
name: Test hls-eval-plugin
175-
run: cabal test hls-eval-plugin-tests || cabal test hls-eval-plugin-tests
158+
run: cabal test hls-eval-plugin-tests || cabal test hls-eval-plugin-tests
176159

177160
- if: matrix.test
178161
name: Test hls-splice-plugin
179-
run: cabal test hls-splice-plugin-tests || cabal test hls-splice-plugin-tests
162+
run: cabal test hls-splice-plugin-tests || cabal test hls-splice-plugin-tests
180163

181164
- if: matrix.test && matrix.ghc != '9.2'
182165
name: Test hls-stan-plugin
183-
run: cabal test hls-stan-plugin-tests || cabal test hls-stan-plugin-tests
166+
run: cabal test hls-stan-plugin-tests || cabal test hls-stan-plugin-tests
184167

185168
- if: matrix.test
186169
name: Test hls-stylish-haskell-plugin
187-
run: cabal test hls-stylish-haskell-plugin-tests || cabal test hls-stylish-haskell-plugin-tests
170+
run: cabal test hls-stylish-haskell-plugin-tests || cabal test hls-stylish-haskell-plugin-tests
188171

189-
- if: matrix.test
172+
- if: matrix.test
190173
name: Test hls-ormolu-plugin
191-
run: cabal test hls-ormolu-plugin-tests || cabal test hls-ormolu-plugin-tests
174+
run: cabal test hls-ormolu-plugin-tests || cabal test hls-ormolu-plugin-tests
192175

193-
- if: matrix.test
176+
- if: matrix.test
194177
name: Test hls-fourmolu-plugin
195-
run: cabal test hls-fourmolu-plugin-tests || cabal test hls-fourmolu-plugin-tests
178+
run: cabal test hls-fourmolu-plugin-tests || cabal test hls-fourmolu-plugin-tests
196179

197180
- if: matrix.test
198181
name: Test hls-explicit-imports-plugin test suite
199-
run: cabal test hls-explicit-imports-plugin-tests || cabal test hls-explicit-imports-plugin-tests
182+
run: cabal test hls-explicit-imports-plugin-tests || cabal test hls-explicit-imports-plugin-tests
200183

201184
- if: matrix.test
202185
name: Test hls-call-hierarchy-plugin test suite
203-
run: cabal test hls-call-hierarchy-plugin-tests || cabal test hls-call-hierarchy-plugin-tests
186+
run: cabal test hls-call-hierarchy-plugin-tests || cabal test hls-call-hierarchy-plugin-tests
204187

205188
- if: matrix.test && matrix.os != 'windows-latest'
206189
name: Test hls-rename-plugin test suite
207-
run: cabal test hls-rename-plugin-tests || cabal test hls-rename-plugin-tests
190+
run: cabal test hls-rename-plugin-tests || cabal test hls-rename-plugin-tests
208191

209-
- if: matrix.test
192+
- if: matrix.test
210193
name: Test hls-hlint-plugin test suite
211-
run: cabal test hls-hlint-plugin-tests || cabal test hls-hlint-plugin-tests
194+
run: cabal test hls-hlint-plugin-tests || cabal test hls-hlint-plugin-tests
212195

213196
- if: matrix.test
214197
name: Test hls-module-name-plugin test suite
215-
run: cabal test hls-module-name-plugin-tests || cabal test hls-module-name-plugin-tests
198+
run: cabal test hls-module-name-plugin-tests || cabal test hls-module-name-plugin-tests
216199

217200
- if: matrix.test
218201
name: Test hls-alternate-number-format-plugin test suite
219-
run: cabal test hls-alternate-number-format-plugin-tests || cabal test hls-alternate-number-format-plugin-tests
202+
run: cabal test hls-alternate-number-format-plugin-tests || cabal test hls-alternate-number-format-plugin-tests
220203

221204
- if: matrix.test
222205
name: Test hls-qualify-imported-names-plugin test suite
223-
run: cabal test hls-qualify-imported-names-plugin-tests || cabal test hls-qualify-imported-names-plugin-tests
206+
run: cabal test hls-qualify-imported-names-plugin-tests || cabal test hls-qualify-imported-names-plugin-tests
224207

225208
- if: matrix.test
226209
name: Test hls-code-range-plugin test suite
227-
run: cabal test hls-code-range-plugin-tests || cabal test hls-code-range-plugin-tests
210+
run: cabal test hls-code-range-plugin-tests || cabal test hls-code-range-plugin-tests
228211

229212
- if: matrix.test
230213
name: Test hls-change-type-signature test suite
231-
run: cabal test hls-change-type-signature-plugin-tests || cabal test hls-change-type-signature-plugin-tests
214+
run: cabal test hls-change-type-signature-plugin-tests || cabal test hls-change-type-signature-plugin-tests
232215

233216
- if: matrix.test
234217
name: Test hls-gadt-plugin test suit
235-
run: cabal test hls-gadt-plugin-tests || cabal test hls-gadt-plugin-tests
218+
run: cabal test hls-gadt-plugin-tests || cabal test hls-gadt-plugin-tests
236219

237220
- if: matrix.test
238221
name: Test hls-explicit-fixity-plugin test suite
239-
run: cabal test hls-explicit-fixity-plugin-tests || cabal test hls-explicit-fixity-plugin-tests
222+
run: cabal test hls-explicit-fixity-plugin-tests || cabal test hls-explicit-fixity-plugin-tests
240223

241224
- if: matrix.test
242225
name: Test hls-explicit-record-fields-plugin test suite
243-
run: cabal test hls-explicit-record-fields-plugin-tests || cabal test hls-explicit-record-fields-plugin-tests
226+
run: cabal test hls-explicit-record-fields-plugin-tests || cabal test hls-explicit-record-fields-plugin-tests
244227

245228
## version needs to be limited since the tests depend on cabal-fmt which only builds using specific ghc versions
246229
- if: matrix.test && matrix.ghc == '9.2'
247230
name: Test hls-cabal-fmt-plugin test suite
248-
run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests
231+
run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests
249232

250233
- if: matrix.test
251234
name: Test hls-cabal-plugin test suite
252-
run: cabal test hls-cabal-plugin-tests || cabal test hls-cabal-plugin-tests
235+
run: cabal test hls-cabal-plugin-tests || cabal test hls-cabal-plugin-tests
253236

254237
- if: matrix.test
255238
name: Test hls-retrie-plugin test suite
256-
run: cabal test hls-retrie-plugin-tests || cabal test hls-retrie-plugin-tests
239+
run: cabal test hls-retrie-plugin-tests || cabal test hls-retrie-plugin-tests
257240

258241
- if: matrix.test
259242
name: Test hls-overloaded-record-dot-plugin test suite
260-
run: cabal test hls-overloaded-record-dot-plugin-tests || cabal test hls-overloaded-record-dot-plugin-tests
243+
run: cabal test hls-overloaded-record-dot-plugin-tests || cabal test hls-overloaded-record-dot-plugin-tests
261244

262245
- if: matrix.test
263246
name: Test hls-semantic-tokens-plugin test suite
264-
run: cabal test hls-semantic-tokens-plugin-tests || cabal test hls-semantic-tokens-plugin-tests
247+
run: cabal test hls-semantic-tokens-plugin-tests || cabal test hls-semantic-tokens-plugin-tests
265248

266249

267250
test_post_job:

0 commit comments

Comments
 (0)