Skip to content

Commit 54bc8ed

Browse files
committed
stop testing GHC < 8.4 (it's complicated these days)
1 parent 467f3f3 commit 54bc8ed

File tree

2 files changed

+12
-30
lines changed

2 files changed

+12
-30
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,6 @@ jobs:
7777
compilerVersion: 8.4.4
7878
setup-method: ghcup
7979
allow-failure: false
80-
- compiler: ghc-8.2.2
81-
compilerKind: ghc
82-
compilerVersion: 8.2.2
83-
setup-method: ghcup
84-
allow-failure: false
85-
- compiler: ghc-8.0.2
86-
compilerKind: ghc
87-
compilerVersion: 8.0.2
88-
setup-method: ghcup
89-
allow-failure: false
9080
fail-fast: false
9181
steps:
9282
- name: apt
@@ -118,8 +108,8 @@ jobs:
118108
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
119109
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
120110
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
121-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
122-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" ; else echo "ARG_BENCH=--disable-benchmarks" >> "$GITHUB_ENV" ; fi
111+
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
112+
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
123113
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
124114
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
125115
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
@@ -205,8 +195,8 @@ jobs:
205195
touch cabal.project
206196
touch cabal.project.local
207197
echo "packages: ${PKGDIR_rere}" >> cabal.project
208-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package rere" >> cabal.project ; fi
209-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
198+
echo "package rere" >> cabal.project
199+
echo " ghc-options: -Werror=missing-methods" >> cabal.project
210200
cat >> cabal.project <<EOF
211201
constraints: rere +rere-intersection
212202
EOF
@@ -235,11 +225,11 @@ jobs:
235225
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
236226
- name: tests
237227
run: |
238-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
228+
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
239229
- name: docspec
240230
run: |
241-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all ; fi
242-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then cabal-docspec $ARG_COMPILER ; fi
231+
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all
232+
cabal-docspec $ARG_COMPILER
243233
- name: cabal check
244234
run: |
245235
cd ${PKGDIR_rere} || false
@@ -262,10 +252,10 @@ jobs:
262252
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere +rere-intersection' all
263253
- name: constraint set no-cfg
264254
run: |
265-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' all --dry-run ; fi
266-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then cabal-plan topo | sort ; fi
267-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' --dependencies-only -j2 all ; fi
268-
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' all ; fi
255+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' all --dry-run
256+
cabal-plan topo | sort
257+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' --dependencies-only -j2 all
258+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='rere -rere-cfg' all
269259
- name: save cache
270260
uses: actions/cache/save@v4
271261
if: always()

rere.cabal

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,7 @@ extra-source-files:
1919
rere.sty
2020

2121
tested-with:
22-
GHC ==7.0.4
23-
|| ==7.2.2
24-
|| ==7.4.2
25-
|| ==7.6.3
26-
|| ==7.8.4
27-
|| ==7.10.3
28-
|| ==8.0.2
29-
|| ==8.2.2
30-
|| ==8.4.4
22+
GHC ==8.4.4
3123
|| ==8.6.5
3224
|| ==8.8.4
3325
|| ==8.10.7

0 commit comments

Comments
 (0)