@@ -236,29 +236,24 @@ jobs:
236
236
name : cabal-${{ runner.os }}-${{ env.CABAL_ARCH }}
237
237
path : ${{ env.CABAL_EXEC_TAR }}
238
238
239
- - name : Validate lib- tests
239
+ - name : Validate tests
240
240
env :
241
241
# `rawSystemStdInOut reports text decoding errors`
242
242
# test does not find ghc without the full path in windows
243
243
GHCPATH : ${{ steps.setup-haskell.outputs.ghc-exe }}
244
- run : sh validate.sh $FLAGS -s lib-tests
245
-
246
- - name : Validate lib-suite
247
- run : sh validate.sh $FLAGS -s lib-suite
248
-
249
- - name : Validate cli-tests
250
- run : sh validate.sh $FLAGS -s cli-tests
251
-
252
- - name : Validate cli-suite
253
- run : sh validate.sh $FLAGS -s cli-suite
254
-
255
- - name : Validate solver-benchmarks-tests
256
- if : matrix.ghc == env.GHC_FOR_SOLVER_BENCHMARKS
257
- run : sh validate.sh $FLAGS -s solver-benchmarks-tests
258
-
259
- - name : Validate solver-benchmarks-run
260
- if : matrix.ghc == env.GHC_FOR_SOLVER_BENCHMARKS
261
- run : sh validate.sh $FLAGS -s solver-benchmarks-run
244
+ run : |
245
+ set +e
246
+ rc=0
247
+ tests="lib-tests lib-suite cli-tests cli-suite"
248
+ if [ "${{ matrix.ghc }}" = "${{ env.GHC_FOR_SOLVER_BENCHMARKS }}" ]; then
249
+ tests="$tests solver-benchmarks-tests solver-benchmarks-run"
250
+ fi
251
+ for test in $tests; do
252
+ echo Validate "$test"
253
+ sh validate.sh $FLAGS -s "$test" || rc=1
254
+ echo End "$test"
255
+ done
256
+ exit $rc
262
257
263
258
validate-old-ghcs :
264
259
name : Validate old ghcs ${{ matrix.extra-ghc }}
@@ -312,11 +307,13 @@ jobs:
312
307
restore-keys : ${{ runner.os }}-${{ env.GHC_FOR_RELEASE }}-
313
308
314
309
- name : Validate build
310
+ id : build
315
311
run : sh validate.sh ${{ env.COMMON_FLAGS }} -s build
316
312
317
313
- name : " Validate lib-suite-extras --extra-hc ghc-${{ matrix.extra-ghc }}"
318
314
env :
319
315
EXTRA_GHC : ghc-${{ matrix.extra-ghc }}
316
+ continue-on-error : true
320
317
run : sh validate.sh ${{ env.COMMON_FLAGS }} --lib-only -s lib-suite-extras --extra-hc "${{ env.EXTRA_GHC }}"
321
318
322
319
build-alpine :
0 commit comments