git.iko.soy/typeable/aeson
on master help sign in
Merge pull request #762 from bos/fixes

Fix attoparsec-iso8601 and add travis build

commit4fa49a94ffa482312c6711ab4fc9f177ece0a615 authorAdam Bergmark <adam@bergmark.nl> dateFri 27 Mar 2020, 01:25 (7 years ago) parent16e912ddba5527
4 files changed+44−29
compare with master
unifiedsplit
.travis.yml+28−19 attoparsec-iso8601/attoparsec-iso8601.cabal+5−4 travis/install.sh+8−3 travis/script.sh+3−3
.travis.yml+28−19
@@ -25,50 +25,59 @@ before_cache:
2525matrix:
2626 include:
2727
28+ # Do the special build steps and handle the newest and oldest
29+ # GHCs first, since these are the most likely to fail.
30+
31+ # HLint
2832 - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
2933 compiler: ": #GHC 8.4.4"
3034 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
3135
32− - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
36+ # Latest GHC
37+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.10.1
38+ compiler: ": #GHC 8.10.1"
39+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.10.1], sources: [hvr-ghc]}}
40+
41+ # Oldest GHC
42+ - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
43+ compiler: ": #GHC 7.8.4"
44+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
45+
46+ # Benchmarks
47+ - env: BUILD=stack CABALVER=3.0 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
3348 compiler: ": #GHC 8.6.5"
34− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
49+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.6.5], sources: [hvr-ghc]}}
3550
36− - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
51+ # C unescape implementation
52+ - env: BUILD=stack CABALVER=3.0 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
3753 compiler: ": #GHC 8.6.5"
38− addons: {apt: {packages: [cabal-install-2.2,ghc-8.6.5], sources: [hvr-ghc]}}
54+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.6.5], sources: [hvr-ghc]}}
3955
40− - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.10.1
41− compiler: ": #GHC 8.10.1"
42− addons: {apt: {packages: [cabal-install-3.0,ghc-8.10.1], sources: [hvr-ghc]}}
4356
4457 - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.3
4558 compiler: ": #GHC 8.8.3"
4659 addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.3], sources: [hvr-ghc]}}
4760
48− - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5
61+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.6.5
4962 compiler: ": #GHC 8.6.5"
50− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
63+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.6.5], sources: [hvr-ghc]}}
5164
52− - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4
65+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.4.4
5366 compiler: ": #GHC 8.4.4"
54− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
67+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.4.4], sources: [hvr-ghc]}}
5568
56− - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
69+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.2.2
5770 compiler: ": #GHC 8.2.2"
58− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
71+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.2.2], sources: [hvr-ghc]}}
5972
60− - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
73+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.0.2
6174 compiler: ": #GHC 8.0.2"
62− addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
75+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.0.2], sources: [hvr-ghc]}}
6376
6477 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
6578 compiler: ": #GHC 7.10.3"
6679 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
6780
68− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
69− compiler: ": #GHC 7.8.4"
70− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
71−
7281before_install:
7382 - unset CC
7483 - export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
attoparsec-iso8601/attoparsec-iso8601.cabal+5−4
@@ -35,11 +35,12 @@ library
3535 Data.Attoparsec.Time.Internal
3636 Data.Attoparsec.Time
3737 build-depends:
38− attoparsec >= 0.13.0.1,
38+ attoparsec >= 0.13.0.1 && < 0.14.0.0,
3939 base >= 4.7 && < 5,
40− base-compat >= 0.9.1 && < 0.12,
41− text >= 1.1.1.0,
42− time >= 1.1.1.4
40+ base-compat-batteries >= 0.10.0 && < 0.12,
41+ time-compat >= 1.9.2.2 && < 1.10,
42+ text >= 1.1.1.0 && < 1.3.0.0,
43+ time >= 1.1.1.4 && < 1.11
4344
4445 if flag(fast)
4546 ghc-options: -O0
travis/install.sh+8−3
@@ -50,9 +50,14 @@ case $BUILD in
5050 fi
5151 ;;
5252 cabal2)
53− cabal v2-update -v
53+ cabal v2-update -v
5454 sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
5555
56− cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry
57− ;;
56+ cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry
57+ ;;
58+ attoparsec-iso8601)
59+ cd attoparsec-iso8601
60+ cabal v2-update -v
61+ sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
62+ cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry
5863esac
travis/script.sh+3−3
@@ -19,9 +19,9 @@ case $BUILD in
1919 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
2020 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
2121 ;;
22− cabal2)
23− cabal v2-build --enable-tests --enable-benchmarks
24− cabal v2-test --enable-tests --enable-benchmarks
22+ cabal2)
23+ cabal v2-build all --enable-tests --enable-benchmarks
24+ cabal v2-test all --enable-tests --enable-benchmarks
2525 ;;
2626 hlint)
2727 make lint