git.iko.soy/typeable/bloodhound
on master help sign in
doctests imports

split ES download links newer java switch java Try to default java easily manually set java_home Update .travis.yml Update .travis.yml Update .travis.yml Update .travis.yml Update .travis.yml Update .travis.yml Update .travis.yml Update .travis.yml

commita25722620b2431d322d9cfee24cc9746d8e05f4d authorJosh Berman <berman.josh@gmail.com> dateSun 4 Dec 2016, 16:50 (10 years ago) parent00726fb
5 files changed+17−18
compare with master
unifiedsplit
.travis.yml+13−14 src/Database/V1/Bloodhound/Client.hs+1−1 src/Database/V1/Bloodhound/Types.hs+1−1 src/Database/V5/Bloodhound/Client.hs+1−1 src/Database/V5/Bloodhound/Types.hs+1−1
.travis.yml+13−14
@@ -4,20 +4,19 @@ addons:
44 apt:
55 packages:
66 - libgmp-dev
7− - openjdk-6-jre
7+ - oracle-java8-installer
88
99env:
10− # - GHCVER=7.6.3 ESVER=1.6.0 # Deprecated
11− # - GHCVER=7.8.3 ESVER=1.0.3 # Deprecated
12− # - GHCVER=7.8.3 ESVER=1.1.2 # Deprecated
13− # - GHCVER=7.8 ESVER=1.2.4 # deprecated
14− - GHCVER=7.8 ESVER=1.3.6 ESFLAG=ES1
15− - GHCVER=7.8 ESVER=1.4.1 ESFLAG=ES1
16− - GHCVER=7.10 ESVER=1.5.2 ESFLAG=ES1
17− - GHCVER=7.10 ESVER=1.6.0 ESFLAG=ES1
18− - GHCVER=7.10 ESVER=1.7.2 ESFLAG=ES1
19− - GHCVER=8.0 ESVER=1.7.2 ESFLAG=ES1
20− - GHCVER=8.0 ESVER=5.0.2 ESFLAG=ES5
10+ global:
11+ - JAVA_HOME=/usr/lib/jvm/java-8-oracle
12+ matrix:
13+ # - GHCVER=7.8 ESVER=1.3.6 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
14+ # - GHCVER=7.8 ESVER=1.4.1 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
15+ # - GHCVER=7.10 ESVER=1.5.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
16+ # - GHCVER=7.10 ESVER=1.6.0 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
17+ # - GHCVER=7.10 ESVER=1.7.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
18+ # - GHCVER=8.0 ESVER=1.7.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
19+ - GHCVER=8.0 ESVER=5.0.2 ESFLAG=ES5 DLINK=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch ES_JAVA_OPTS="-Xms500m -Xmx750m"
2120
2221install:
2322 # stack
@@ -28,7 +27,7 @@ install:
2827 - stack --version
2928
3029 # 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
3231 - tar xzf elasticsearch-$ESVER.tar.gz
3332 # set up a repo for snapshot testing. Required in ES >= 1.6
3433 - echo "path.repo = [\"/tmp\"]" >> ./elasticsearch-$ESVER/elasticsearch.yml
@@ -37,7 +36,7 @@ install:
3736script:
3837 - stack setup
3938 - stack update
40− - stack build
39+ - stack build -j1
4140 - stack test --flag bloodhound:$ESFLAG
4241
4342cache:
src/Database/V1/Bloodhound/Client.hs+1−1
@@ -126,7 +126,7 @@ import Database.V1.Bloodhound.Types
126126-- $setup
127127-- >>> :set -XOverloadedStrings
128128-- >>> :set -XDeriveGeneric
129−-- >>> import Database.Bloodhound
129+-- >>> import Database.V1.Bloodhound
130130-- >>> let testServer = (Server "http://localhost:9200")
131131-- >>> let runBH' = withBH defaultManagerSettings testServer
132132-- >>> let testIndex = IndexName "twitter"
src/Database/V1/Bloodhound/Types.hs+1−1
@@ -403,7 +403,7 @@ import Database.V1.Bloodhound.Types.Internal
403403-- $setup
404404-- >>> :set -XOverloadedStrings
405405-- >>> import Data.Aeson
406−-- >>> import Database.Bloodhound
406+-- >>> import Database.V1.Bloodhound
407407-- >>> let testServer = (Server "http://localhost:9200")
408408-- >>> let testIndex = IndexName "twitter"
409409-- >>> let testMapping = MappingName "tweet"
src/Database/V5/Bloodhound/Client.hs+1−1
@@ -125,7 +125,7 @@ import Database.V5.Bloodhound.Types
125125-- $setup
126126-- >>> :set -XOverloadedStrings
127127-- >>> :set -XDeriveGeneric
128−-- >>> import Database.Bloodhound
128+-- >>> import Database.V5.Bloodhound
129129-- >>> let testServer = (Server "http://localhost:9200")
130130-- >>> let runBH' = withBH defaultManagerSettings testServer
131131-- >>> let testIndex = IndexName "twitter"
src/Database/V5/Bloodhound/Types.hs+1−1
@@ -402,7 +402,7 @@ import Database.V5.Bloodhound.Types.Internal
402402-- $setup
403403-- >>> :set -XOverloadedStrings
404404-- >>> import Data.Aeson
405−-- >>> import Database.Bloodhound
405+-- >>> import Database.V5.Bloodhound
406406-- >>> let testServer = (Server "http://localhost:9200")
407407-- >>> let testIndex = IndexName "twitter"
408408-- >>> let testMapping = MappingName "tweet"