git.iko.soy/typeable/aeson
on master help sign in
stack & travis updates
commit35ae44dbec513b45d4ec94d95588c56d35b7f88a authorAdam Bergmark <adam@bergmark.nl> dateSun 19 Feb 2017, 14:54 (10 years ago) parent1906833
4 files changed+16−16
compare with master
unifiedsplit
.travis.yml+9−6 benchmarks/aeson-benchmarks.cabal+4−2 stack-bench.yaml+2−7 travis/script.sh+1−1
.travis.yml+9−6
@@ -19,9 +19,15 @@ before_cache:
1919
2020matrix:
2121 include:
22− - env: BUILD=stack CABALVER=1.22 GHCVER=7.10.3 STACK_YAML=stack-bench.yaml
23− compiler: ": #GHC 7.10.3"
24− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
22+ - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
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"
30+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
2531 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
2632 compiler: ": #GHC 7.4.2"
2733 addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
@@ -34,9 +40,6 @@ matrix:
3440 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
3541 compiler: ": #GHC 7.10.3"
3642 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]}}
4043
4144before_install:
4245 - unset CC
benchmarks/aeson-benchmarks.cabal+4−2
@@ -10,7 +10,7 @@ flag bytestring-builder
1010 manual: False
1111
1212library
13− hs-source-dirs: .. .
13+ hs-source-dirs: .. . ../ffi ../pure
1414 c-sources: ../cbits/unescape_string.c
1515 exposed-modules:
1616 Data.Aeson
@@ -24,6 +24,8 @@ library
2424 Data.Aeson.Parser.Internal
2525 Data.Aeson.Parser.Time
2626 Data.Aeson.Parser.Unescape
27+ Data.Aeson.Parser.UnescapeFFI
28+ Data.Aeson.Parser.UnescapePure
2729 Data.Aeson.TH
2830 Data.Aeson.Text
2931 Data.Aeson.Types
@@ -177,7 +179,7 @@ executable aeson-benchmark-json-parse
177179
178180executable aeson-benchmark-dates
179181 main-is: Dates.hs
180− ghc-options: -Wall -O2 -rtsopts
182+ ghc-options: -Wall -O2 -rtsopts -fsimpl-tick-factor=200
181183 build-depends:
182184 base,
183185 base-compat,
stack-bench.yaml+2−7
@@ -1,9 +1,4 @@
1−resolver: lts-6.5
1+resolver: lts-8.5
22packages:
3+- '.'
34- 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
44
55case $BUILD in
66 stack)
7− stack build --test --haddock
7+ stack build --test --haddock --no-terminal
88 ;;
99 cabal)
1010 if [ -f configure.ac ]; then autoreconf -i; fi