9ccbe91 · typeable/katip

git.iko.soy/typeable/katip

Prepare for next nightly

We're caught behind bloodhound's aeson bounds, which are eliminated on master, but when that clears we should be able to build.

commit9ccbe9123e073bb1008ffc58e0deefa3944c2dd4 authorMichael Xavier <michael@michaelxavier.net> dateThu 17 May 2018, 11:28 (8 years ago) parentecb20a6

3 files changed+7−3

compare with master

unifiedsplit

.travis.yml+4 katip-elasticsearch/katip-elasticsearch.cabal+2−2 katip/katip.cabal+1−1

.travis.yml+4

@@ -22,6 +22,10 @@ matrix:

2222 - env: ARGS="--resolver=lts-10" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"

2323 - env: ARGS="--resolver=nightly" ESVERSION=5.5.0 ESURL=https://artifacts.elastic.co/downloads/elasticsearch ESTESTARGS="--es-version 5" ES_JAVA_OPTS="-Xms500m -Xmx750m" JAVA_HOME=/usr/lib/jvm/java-8-oracle

2424 - env: ARGS="--resolver=nightly" ESVERSION=6.2.2 ESURL=https://artifacts.elastic.co/downloads/elasticsearch ESTESTARGS="--es-version 5" ES_JAVA_OPTS="-Xms500m -Xmx750m" JAVA_HOME=/usr/lib/jvm/java-8-oracle

25+ # nightlies may fail from time to time

26+ allow_failures:

27+ - env: ARGS="--resolver=nightly" ESVERSION=5.5.0 ESURL=https://artifacts.elastic.co/downloads/elasticsearch ESTESTARGS="--es-version 5" ES_JAVA_OPTS="-Xms500m -Xmx750m" JAVA_HOME=/usr/lib/jvm/java-8-oracle

28+ - env: ARGS="--resolver=nightly" ESVERSION=6.2.2 ESURL=https://artifacts.elastic.co/downloads/elasticsearch ESTESTARGS="--es-version 5" ES_JAVA_OPTS="-Xms500m -Xmx750m" JAVA_HOME=/usr/lib/jvm/java-8-oracle

2529

2630before_install:

2731# Download and unpack the stack executable

katip-elasticsearch/katip-elasticsearch.cabal+2−2

@@ -38,10 +38,10 @@ library

3838 , katip >= 0.2.0.0 && < 0.6

3939 , bloodhound >= 0.13.0.0 && < 0.16

4040 , uuid >= 1.3.12 && < 1.4

41− , aeson >=0.6 && <1.3

41+ , aeson >=0.6 && <1.4

4242 , stm >= 2.4.3 && < 2.5

4343 , stm-chans >= 3.0.0.2 && < 3.1

44− , async >= 2.0.1.0 && < 2.2

44+ , async >= 2.0.1.0 && < 3.0

4545 , enclosed-exceptions >= 1.0.0 && < 1.1

4646 , http-client >= 0.3 && < 0.6

4747 , text >= 0.11 && < 1.3

katip/katip.cabal+1−1

@@ -54,7 +54,7 @@ library

5454 OverloadedStrings

5555

5656 build-depends: base >=4.5 && <5

57− , aeson >=0.6 && <1.3

57+ , aeson >=0.6 && <1.4

5858 , async < 3.0.0.0

5959 , auto-update >= 0.1 && < 0.2

6060 , bytestring >= 0.9 && < 0.11