35ae44d · typeable/aeson

.travis.yml+9−6

compare with master

unifiedsplit

@@ -19,9 +19,15 @@ before_cache:

19

20matrix:

21 include:

22− - env: BUILD=stack CABALVER=1.22 GHCVER=7.10.3 STACK_YAML=stack-bench.yaml

22+ - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml

23− compiler: ": #GHC 7.10.3"

23+ compiler: ": #GHC 8.0.2"

24+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}

25+ - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-pure-unescape.yaml

26+ compiler: ": #GHC 8.0.2"

27+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}

28+ - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2

29+ compiler: ": #GHC 8.0.2"

24− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

30+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}

25 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2

31 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2

26 compiler: ": #GHC 7.4.2"

32 compiler: ": #GHC 7.4.2"

27 addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}

33 addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}

@@ -34,9 +40,6 @@ matrix:

34 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3

40 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3

35 compiler: ": #GHC 7.10.3"

41 compiler: ": #GHC 7.10.3"

36 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

42 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

37− - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2

38− compiler: ": #GHC 8.0.2"

39− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}

40

43

41before_install:

44before_install:

42 - unset CC

45 - unset CC

benchmarks/aeson-benchmarks.cabal+4−2

@@ -10,7 +10,7 @@ flag bytestring-builder

10 manual: False

11

12library

13− hs-source-dirs: .. .

13+ hs-source-dirs: .. . ../ffi ../pure

14 c-sources: ../cbits/unescape_string.c

15 exposed-modules:

16 Data.Aeson

@@ -24,6 +24,8 @@ library

24 Data.Aeson.Parser.Internal

25 Data.Aeson.Parser.Time

26 Data.Aeson.Parser.Unescape

27+ Data.Aeson.Parser.UnescapeFFI

28+ Data.Aeson.Parser.UnescapePure

27 Data.Aeson.TH

29 Data.Aeson.TH

28 Data.Aeson.Text

30 Data.Aeson.Text

29 Data.Aeson.Types

31 Data.Aeson.Types

@@ -177,7 +179,7 @@ executable aeson-benchmark-json-parse

177

179

178executable aeson-benchmark-dates

180executable aeson-benchmark-dates

179 main-is: Dates.hs

181 main-is: Dates.hs

180− ghc-options: -Wall -O2 -rtsopts

182+ ghc-options: -Wall -O2 -rtsopts -fsimpl-tick-factor=200

181 build-depends:

183 build-depends:

182 base,

184 base,

183 base-compat,

185 base-compat,

stack-bench.yaml+2−7

@@ -1,9 +1,4 @@

1−resolver: lts-6.5

1+resolver: lts-8.5

2packages:

3+- '.'

3- benchmarks

4- benchmarks

4−extra-deps:

5−- semigroups-0.18.2

6−- integer-logarithms-1

7−flags:

8− semigroups:

9− bytestring-builder: false

travis/script.sh+1−1

@@ -4,7 +4,7 @@ set -ex

4

5case $BUILD in

6 stack)

7− stack build --test --haddock

7+ stack build --test --haddock --no-terminal

8 ;;

9 cabal)

10 if [ -f configure.ac ]; then autoreconf -i; fi