Skip to content

Commit

Permalink
Allow text-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasabel committed Dec 26, 2021
1 parent c9cd989 commit 5c3bf58
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.13.20211030
# version: 0.13.20211116
#
# REGENDATA ("0.13.20211030",["github","HsYAML.cabal"])
# REGENDATA ("0.13.20211116",["github","HsYAML.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -20,6 +20,8 @@ jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-18.04
timeout-minutes:
60
container:
image: buildpack-deps:bionic
continue-on-error: ${{ matrix.allow-failure }}
Expand Down Expand Up @@ -165,6 +167,10 @@ jobs:
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
cat >> $CABAL_CONFIG <<EOF
program-default-options
ghc-options: $GHCJOBS +RTS -M3G -RTS
EOF
cat $CABAL_CONFIG
- name: versions
run: |
Expand Down Expand Up @@ -212,7 +218,7 @@ jobs:
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(HsYAML|binary|bytestring|transformers)$/; }' >> cabal.project.local
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(HsYAML|binary|bytestring|text|transformers)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
Expand Down
3 changes: 2 additions & 1 deletion HsYAML.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cabal-version: 1.14
name: HsYAML
version: 0.2.1.0
x-revision: 4

synopsis: Pure Haskell YAML 1.2 processor
homepage: https://github.com/hvr/HsYAML
Expand Down Expand Up @@ -93,7 +94,7 @@ library
, bytestring >=0.9 && <0.12
, containers >=0.4.2 && <0.7
, deepseq >=1.3.0 && <1.5
, text >=1.2.3 && <1.3
, text >=1.2.3 && <2.1
, mtl >=2.2.1 && <2.3
, parsec >=3.1.13.0 && < 3.2

Expand Down
2 changes: 1 addition & 1 deletion cabal.haskell-ci
Original file line number Diff line number Diff line change
@@ -1 +1 @@
installed: +all -binary -bytestring -transformers
installed: +all -binary -bytestring -transformers -text

0 comments on commit 5c3bf58

Please sign in to comment.