1ef8115 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Merge branch 'master' of github.com:bitemyapp/bloodhound

commit1ef811529264e22cc4e1679c39c789aaada277b6 authorChris Allen <cma@bitemyapp.com> dateThu 3 Aug 2017, 21:27 (9 years ago) parent3336db4 560a55a

5 files changed+22−8

compare with master

unifiedsplit

.gitignore+1 .travis.yml+13−6 bloodhound.cabal+2−2 tests/V1/tests.hs+3 tests/V5/tests.hs+3

.gitignore+1

@@ -17,3 +17,4 @@ bloodhound.iml

1717.hg

1818.hgignore

1919examples/bloodhound-examples.cabal

20+/.ghc.environment.*

.travis.yml+13−6

@@ -1,4 +1,5 @@

11sudo: false

2+language: generic

34addons:

45 apt:

@@ -21,9 +22,9 @@ env:

2122install:

2223 # stack

2324 - 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'

2526 - export PATH=~/.local/bin:$PATH

26− - stack --version

27+ - stack --no-terminal --version

2728

2829 # elasticsearch

2930 - wget --no-check-certificate $DLINK-$ESVER.tar.gz

@@ -33,11 +34,17 @@ install:

3334 - ./elasticsearch-$ESVER/bin/elasticsearch &

3435

3536script:

36− - stack setup

37− - stack update

38− - stack build -j1

39− - stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:$ESFLAG

37+ - stack setup --no-terminal

38+ - stack update --no-terminal

39+ - stack build -j2 --fast --no-terminal

40+ - travis_wait 45 sleep 1800 &

41+ - stack test --fast --no-terminal bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:$ESFLAG

4042

4143cache:

44+ timeout: 2000

4245 directories:

46+ - $HOME/.cabal

47+ - $HOME/.ghc

4348 - $HOME/.stack

49+ - .stack-work/

50+ apt: true

bloodhound.cabal+2−2

@@ -48,7 +48,7 @@ library

4848 http-client >= 0.4.30 && <0.6,

4949 network-uri >= 2.6 && <2.7,

5050 semigroups >= 0.15 && <0.19,

51− time >= 1.4 && <1.7,

51+ time >= 1.4 && <1.9,

5252 text >= 0.11 && <1.3,

5353 mtl >= 1.0 && <2.3,

5454 transformers >= 0.2 && <0.6,

@@ -88,7 +88,7 @@ test-suite tests

8888 unordered-containers >= 0.2.5.0 && <0.3,

8989 mtl,

9090 quickcheck-properties,

91− generics-sop >=0.2 && <0.3,

91+ generics-sop >=0.2 && <0.4,

9292 errors,

9393 exceptions,

9494 temporary,

tests/V1/tests.hs+3

@@ -12,6 +12,9 @@

1212#if __GLASGOW_HASKELL__ < 800

1313{-# OPTIONS_GHC -fcontext-stack=100 #-}

1414#endif

15+#if __GLASGOW_HASKELL__ >= 802

16+{-# LANGUAGE MonoLocalBinds #-}

17+#endif

1518module Main where

1619

1720import Control.Applicative

tests/V5/tests.hs+3