stack & travis updates

Author: bergmark

.travis.yml

@@ -19,9 +19,15 @@ before_cache:
 
 matrix:
   include:
-    - env: BUILD=stack CABALVER=1.22 GHCVER=7.10.3 STACK_YAML=stack-bench.yaml
-      compiler: ": #GHC 7.10.3"
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
+    - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
+      compiler: ": #GHC 8.0.2"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
+    - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-pure-unescape.yaml
+      compiler: ": #GHC 8.0.2"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
+    - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
+      compiler: ": #GHC 8.0.2"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
     - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
       compiler: ": #GHC 7.4.2"
       addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
@@ -34,9 +40,6 @@ matrix:
     - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
       compiler: ": #GHC 7.10.3"
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
-    - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
-      compiler: ": #GHC 8.0.2"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
 
 before_install:
  - unset CC

benchmarks/aeson-benchmarks.cabal

@@ -10,7 +10,7 @@ flag bytestring-builder
   manual: False
 
 library
-  hs-source-dirs: .. .
+  hs-source-dirs: .. . ../ffi ../pure
   c-sources:  ../cbits/unescape_string.c
   exposed-modules:
     Data.Aeson
@@ -24,6 +24,8 @@ library
     Data.Aeson.Parser.Internal
     Data.Aeson.Parser.Time
     Data.Aeson.Parser.Unescape
+    Data.Aeson.Parser.UnescapeFFI
+    Data.Aeson.Parser.UnescapePure
     Data.Aeson.TH
     Data.Aeson.Text
     Data.Aeson.Types
@@ -177,7 +179,7 @@ executable aeson-benchmark-json-parse
 
 executable aeson-benchmark-dates
   main-is: Dates.hs
-  ghc-options: -Wall -O2 -rtsopts
+  ghc-options: -Wall -O2 -rtsopts -fsimpl-tick-factor=200
   build-depends:
     base,
     base-compat,

stack-bench.yaml

@@ -1,9 +1,4 @@
-resolver: lts-6.5
+resolver: lts-8.5
 packages:
+- '.'
 - benchmarks
-extra-deps:
-- semigroups-0.18.2
-- integer-logarithms-1
-flags:
-  semigroups:
-    bytestring-builder: false

travis/script.sh

@@ -4,7 +4,7 @@ set -ex
 
 case $BUILD in
   stack)
-    stack build --test --haddock
+    stack build --test --haddock --no-terminal
     ;;
   cabal)
     if [ -f configure.ac ]; then autoreconf -i; fi