git.iko.soy/typeable/aeson
on master help sign in
Merge pull request #762 from bos/fixes
4fa49a9Adam Bergmark
.travis.yml+28−19
compare with master
unifiedsplit
@@ -25,50 +25,59 @@ before_cache:
25matrix:
25matrix:
26 include:
26 include:
27
27
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
28 - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
32 - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
29 compiler: ": #GHC 8.4.4"
33 compiler: ": #GHC 8.4.4"
30 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
34 addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
31
35
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
32− - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
47+ - env: BUILD=stack CABALVER=3.0 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
33 compiler: ": #GHC 8.6.5"
48 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]}}
35
50
51+ # C unescape implementation
36− - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
52+ - env: BUILD=stack CABALVER=3.0 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
37 compiler: ": #GHC 8.6.5"
53 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]}}
39
55
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]}}
43
56
44 - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.3
57 - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.3
45 compiler: ": #GHC 8.8.3"
58 compiler: ": #GHC 8.8.3"
46 addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.3], sources: [hvr-ghc]}}
59 addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.3], sources: [hvr-ghc]}}
47
60
48− - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5
61+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.6.5
49 compiler: ": #GHC 8.6.5"
62 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]}}
51
64
52− - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4
65+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.4.4
53 compiler: ": #GHC 8.4.4"
66 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]}}
55
68
56− - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
69+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.2.2
57 compiler: ": #GHC 8.2.2"
70 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]}}
59
72
60− - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
73+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.0.2
61 compiler: ": #GHC 8.0.2"
74 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]}}
63
76
64 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
77 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
65 compiler: ": #GHC 7.10.3"
78 compiler: ": #GHC 7.10.3"
66 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
79 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
67
80
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−
72before_install:
81before_install:
73 - unset CC
82 - unset CC
74 - export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
83 - 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
35 Data.Attoparsec.Time.Internal
35 Data.Attoparsec.Time.Internal
36 Data.Attoparsec.Time
36 Data.Attoparsec.Time
37 build-depends:
37 build-depends:
38− attoparsec >= 0.13.0.1,
38+ attoparsec >= 0.13.0.1 && < 0.14.0.0,
39 base >= 4.7 && < 5,
39 base >= 4.7 && < 5,
40− base-compat >= 0.9.1 && < 0.12,
40+ base-compat-batteries >= 0.10.0 && < 0.12,
41+ time-compat >= 1.9.2.2 && < 1.10,
41− text >= 1.1.1.0,
42+ text >= 1.1.1.0 && < 1.3.0.0,
42− time >= 1.1.1.4
43+ time >= 1.1.1.4 && < 1.11
43
44
44 if flag(fast)
45 if flag(fast)
45 ghc-options: -O0
46 ghc-options: -O0
travis/install.sh+8−3
@@ -50,9 +50,14 @@ case $BUILD in
50 fi
50 fi
51 ;;
51 ;;
52 cabal2)
52 cabal2)
53− cabal v2-update -v
53+ cabal v2-update -v
54 sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
54 sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
55
55
56− cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry
56+ cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry
57− ;;
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
58esac
63esac
travis/script.sh+3−3
@@ -19,9 +19,9 @@ case $BUILD in
19 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
19 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
20 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
20 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
21 ;;
21 ;;
22− cabal2)
22+ cabal2)
23− cabal v2-build --enable-tests --enable-benchmarks
23+ cabal v2-build all --enable-tests --enable-benchmarks
24− cabal v2-test --enable-tests --enable-benchmarks
24+ cabal v2-test all --enable-tests --enable-benchmarks
25 ;;
25 ;;
26 hlint)
26 hlint)
27 make lint
27 make lint