Skip to content

Commit 7107546

Browse files
committed
Update Haskell-CI
Tried to add constraint-set for mtl-2.3 / transformers-0.6 but time isn't ripe for this yet (some deps do not allow mtl-2.3).
1 parent 9aa9839 commit 7107546

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.14.3.20220416
11+
# version: 0.15.20220504
1212
#
13-
# REGENDATA ("0.14.3.20220416",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.15.20220504",["--config=cabal.haskell-ci","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-18.04
26+
runs-on: ubuntu-20.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -217,13 +217,8 @@ jobs:
217217
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi
218218
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
219219
cat >> cabal.project <<EOF
220-
constraints: hashable >=1.3
221-
constraints: semigroups ^>=0.19
222220
constraints: github +openssl
223221
constraints: github-samples +openssl
224-
allow-newer: deepseq-generics-0.2.0.0:base
225-
allow-newer: deepseq-generics-0.2.0.0:ghc-prim
226-
allow-newer: HsOpenSSL:bytestring
227222
optimization: False
228223
EOF
229224
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(github|github-samples)$/; }' >> cabal.project.local
@@ -260,7 +255,7 @@ jobs:
260255
if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
261256
- name: haddock
262257
run: |
263-
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
258+
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
264259
- name: unconstrained build
265260
run: |
266261
rm -f cabal.project.local

cabal.haskell-ci

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,12 @@ branches: master
22
haddock: >=8.6
33
-- See PR #355: haddocks for GADT constructor arguments only supported from GHC 8.6
44
jobs-selection: any
5+
6+
-- Some dependencies do not allow mtl-2.3 yet, so this doesn't pass yet:
7+
-- constraint-set mtl-2.3
8+
-- ghc: >= 8.6
9+
-- constraints: mtl >= 2.3, transformers >= 0.6
10+
11+
-- constraint-set text-2.0
12+
-- constraints: text >= 2.0
13+
-- allow-newer: *:text -- allow-newer not supported

cabal.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ tests: True
77
constraints: github +openssl
88
constraints: github-samples +openssl
99

10-
constraints: text >=2
11-
allow-newer: *:text
10+
-- constraints: text >=2
11+
-- allow-newer: *:text

0 commit comments

Comments
 (0)