a257226 · typeable/bloodhound

.travis.yml+13−14

compare with master

unifiedsplit

@@ -4,20 +4,19 @@ addons:

4 apt:

5 packages:

6 - libgmp-dev

7− - openjdk-6-jre

7+ - oracle-java8-installer

8

9env:

10− # - GHCVER=7.6.3 ESVER=1.6.0 # Deprecated

10+ global:

11− # - GHCVER=7.8.3 ESVER=1.0.3 # Deprecated

11+ - JAVA_HOME=/usr/lib/jvm/java-8-oracle

12− # - GHCVER=7.8.3 ESVER=1.1.2 # Deprecated

12+ matrix:

13− # - GHCVER=7.8 ESVER=1.2.4 # deprecated

13+ # - GHCVER=7.8 ESVER=1.3.6 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

14− - GHCVER=7.8 ESVER=1.3.6 ESFLAG=ES1

14+ # - GHCVER=7.8 ESVER=1.4.1 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

15− - GHCVER=7.8 ESVER=1.4.1 ESFLAG=ES1

16− - GHCVER=7.10 ESVER=1.5.2 ESFLAG=ES1

15+ # - GHCVER=7.10 ESVER=1.5.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

17− - GHCVER=7.10 ESVER=1.6.0 ESFLAG=ES1

16+ # - GHCVER=7.10 ESVER=1.6.0 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

18− - GHCVER=7.10 ESVER=1.7.2 ESFLAG=ES1

17+ # - GHCVER=7.10 ESVER=1.7.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

19− - GHCVER=8.0 ESVER=1.7.2 ESFLAG=ES1

18+ # - GHCVER=8.0 ESVER=1.7.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

20− - GHCVER=8.0 ESVER=5.0.2 ESFLAG=ES5

19+ - GHCVER=8.0 ESVER=5.0.2 ESFLAG=ES5 DLINK=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch ES_JAVA_OPTS="-Xms500m -Xmx750m"

21

20

22install:

21install:

23 # stack

22 # stack

@@ -28,7 +27,7 @@ install:

28 - stack --version

27 - stack --version

29

28

30 # elasticsearch

29 # elasticsearch

31− - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ESVER.tar.gz

30+ - wget --no-check-certificate $DLINK-$ESVER.tar.gz

32 - tar xzf elasticsearch-$ESVER.tar.gz

31 - tar xzf elasticsearch-$ESVER.tar.gz

33 # set up a repo for snapshot testing. Required in ES >= 1.6

32 # set up a repo for snapshot testing. Required in ES >= 1.6

34 - echo "path.repo = [\"/tmp\"]" >> ./elasticsearch-$ESVER/elasticsearch.yml

33 - echo "path.repo = [\"/tmp\"]" >> ./elasticsearch-$ESVER/elasticsearch.yml

@@ -37,7 +36,7 @@ install:

37script:

36script:

38 - stack setup

37 - stack setup

39 - stack update

38 - stack update

40− - stack build

39+ - stack build -j1

41 - stack test --flag bloodhound:$ESFLAG

40 - stack test --flag bloodhound:$ESFLAG

42

41

43cache:

42cache:

src/Database/V1/Bloodhound/Client.hs+1−1

@@ -126,7 +126,7 @@ import Database.V1.Bloodhound.Types

126-- $setup

127-- >>> :set -XOverloadedStrings

128-- >>> :set -XDeriveGeneric

129−-- >>> import Database.Bloodhound

129+-- >>> import Database.V1.Bloodhound

130-- >>> let testServer = (Server "http://localhost:9200")

131-- >>> let runBH' = withBH defaultManagerSettings testServer

132-- >>> let testIndex = IndexName "twitter"

src/Database/V1/Bloodhound/Types.hs+1−1

@@ -403,7 +403,7 @@ import Database.V1.Bloodhound.Types.Internal

403-- $setup

404-- >>> :set -XOverloadedStrings

405-- >>> import Data.Aeson

406−-- >>> import Database.Bloodhound

406+-- >>> import Database.V1.Bloodhound

407-- >>> let testServer = (Server "http://localhost:9200")

408-- >>> let testIndex = IndexName "twitter"

409-- >>> let testMapping = MappingName "tweet"

src/Database/V5/Bloodhound/Client.hs+1−1

@@ -125,7 +125,7 @@ import Database.V5.Bloodhound.Types

125-- $setup

126-- >>> :set -XOverloadedStrings

127-- >>> :set -XDeriveGeneric

128−-- >>> import Database.Bloodhound

128+-- >>> import Database.V5.Bloodhound

129-- >>> let testServer = (Server "http://localhost:9200")

130-- >>> let runBH' = withBH defaultManagerSettings testServer

131-- >>> let testIndex = IndexName "twitter"

src/Database/V5/Bloodhound/Types.hs+1−1

@@ -402,7 +402,7 @@ import Database.V5.Bloodhound.Types.Internal

402-- $setup

403-- >>> :set -XOverloadedStrings

404-- >>> import Data.Aeson

405−-- >>> import Database.Bloodhound

405+-- >>> import Database.V5.Bloodhound

406-- >>> let testServer = (Server "http://localhost:9200")

407-- >>> let testIndex = IndexName "twitter"

408-- >>> let testMapping = MappingName "tweet"