git.iko.soy/typeable/bloodhound
on master help sign in
Merge branch 'master' of github.com:bitemyapp/bloodhound
1ef8115Chris Allen
.gitignore+1
@@ -17,3 +17,4 @@ bloodhound.iml
17.hg
17.hg
18.hgignore
18.hgignore
19examples/bloodhound-examples.cabal
19examples/bloodhound-examples.cabal
20+/.ghc.environment.*
.travis.yml+13−6
@@ -1,4 +1,5 @@
1sudo: false
1sudo: false
2+language: generic
2
3
3addons:
4addons:
4 apt:
5 apt:
@@ -21,9 +22,9 @@ env:
21install:
22install:
22 # stack
23 # stack
23 - mkdir -p ~/.local/bin
24 - mkdir -p ~/.local/bin
24− - travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v1.2.0/stack-1.2.0-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
25+ - travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v1.4.0/stack-1.4.0-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
25 - export PATH=~/.local/bin:$PATH
26 - export PATH=~/.local/bin:$PATH
26− - stack --version
27+ - stack --no-terminal --version
27
28
28 # elasticsearch
29 # elasticsearch
29 - wget --no-check-certificate $DLINK-$ESVER.tar.gz
30 - wget --no-check-certificate $DLINK-$ESVER.tar.gz
@@ -33,11 +34,17 @@ install:
33 - ./elasticsearch-$ESVER/bin/elasticsearch &
34 - ./elasticsearch-$ESVER/bin/elasticsearch &
34
35
35script:
36script:
36− - stack setup
37+ - stack setup --no-terminal
37− - stack update
38+ - stack update --no-terminal
38− - stack build -j1
39+ - stack build -j2 --fast --no-terminal
40+ - travis_wait 45 sleep 1800 &
39− - stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:$ESFLAG
41+ - stack test --fast --no-terminal bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:$ESFLAG
40
42
41cache:
43cache:
44+ timeout: 2000
42 directories:
45 directories:
46+ - $HOME/.cabal
47+ - $HOME/.ghc
43 - $HOME/.stack
48 - $HOME/.stack
49+ - .stack-work/
50+ apt: true
bloodhound.cabal+2−2
@@ -48,7 +48,7 @@ library
48 http-client >= 0.4.30 && <0.6,
48 http-client >= 0.4.30 && <0.6,
49 network-uri >= 2.6 && <2.7,
49 network-uri >= 2.6 && <2.7,
50 semigroups >= 0.15 && <0.19,
50 semigroups >= 0.15 && <0.19,
51− time >= 1.4 && <1.7,
51+ time >= 1.4 && <1.9,
52 text >= 0.11 && <1.3,
52 text >= 0.11 && <1.3,
53 mtl >= 1.0 && <2.3,
53 mtl >= 1.0 && <2.3,
54 transformers >= 0.2 && <0.6,
54 transformers >= 0.2 && <0.6,
@@ -88,7 +88,7 @@ test-suite tests
88 unordered-containers >= 0.2.5.0 && <0.3,
88 unordered-containers >= 0.2.5.0 && <0.3,
89 mtl,
89 mtl,
90 quickcheck-properties,
90 quickcheck-properties,
91− generics-sop >=0.2 && <0.3,
91+ generics-sop >=0.2 && <0.4,
92 errors,
92 errors,
93 exceptions,
93 exceptions,
94 temporary,
94 temporary,
tests/V1/tests.hs+3
@@ -12,6 +12,9 @@
12#if __GLASGOW_HASKELL__ < 800
12#if __GLASGOW_HASKELL__ < 800
13{-# OPTIONS_GHC -fcontext-stack=100 #-}
13{-# OPTIONS_GHC -fcontext-stack=100 #-}
14#endif
14#endif
15+#if __GLASGOW_HASKELL__ >= 802
16+{-# LANGUAGE MonoLocalBinds #-}
17+#endif
15module Main where
18module Main where
16
19
17import Control.Applicative
20import Control.Applicative
tests/V5/tests.hs+3
@@ -12,6 +12,9 @@
12#if __GLASGOW_HASKELL__ < 800
12#if __GLASGOW_HASKELL__ < 800
13{-# OPTIONS_GHC -fcontext-stack=100 #-}
13{-# OPTIONS_GHC -fcontext-stack=100 #-}
14#endif
14#endif
15+#if __GLASGOW_HASKELL__ >= 802
16+{-# LANGUAGE MonoLocalBinds #-}
17+#endif
15module Main where
18module Main where
16
19
17import Control.Applicative
20import Control.Applicative