237144c · typeable/bloodhound

git.iko.soy/typeable/bloodhound

on master help sign in

update travis and Makefile

237144cJosh Berman10 years ago

.travis.yml+7−15

compare with master

unifiedsplit

@@ -10,24 +10,16 @@ env:

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

13+ - GHCVER=7.8 ESVER=1.3.6 STACK_YAML=stack-7.8.yaml 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

14+ - GHCVER=7.8 ESVER=1.4.1 STACK_YAML=stack-7.8.yaml 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

15+ - GHCVER=7.10 ESVER=1.5.2 STACK_YAML=stack-7.10.yaml 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

16+ - GHCVER=7.10 ESVER=1.6.0 STACK_YAML=stack-7.10.yaml 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=2.4.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.2/elasticsearch

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

20− # - GHCVER=8.0 ESVER=2.4.2 ESFLAG=ES5 DLINK=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.2/elasticsearch

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

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

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

22−

23−# matrix:

24−# allow_failures:

25−# - env: GHCVER=8.0 ESVER=2.4.2 ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.2/elasticsearch

26−# - env: GHCVER=8.0 ESVER=2.4.2 ESFLAG=ES5 DLINK=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.2/elasticsearch

28install:

21install:

29 # stack

22 # stack

30− - export STACK_YAML=stack-$GHCVER.yaml

31 - mkdir -p ~/.local/bin

23 - mkdir -p ~/.local/bin

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

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'

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

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

Makefile+4−4

@@ -13,11 +13,11 @@ test: echo-warn

137.8-test: echo-warn

14 STACK_YAML="stack-7.8.yaml" stack test

16−8.0-build:

16+7.10-build:

17− STACK_YAML="stack-8.0.yaml" stack build

17+ STACK_YAML="stack-8=7.10.yaml" stack build

19−8.0-test: echo-warn

19+7.10-test: echo-warn

20− STACK_YAML="stack-8.0.yaml" stack test

20+ STACK_YAML="stack-7.10.yaml" stack test

22ghci:

23 stack ghci

stack-8.0.yamldeleted−15

@@ -1,15 +0,0 @@

1−flags: {}

2−packages:

3−- '.'

4−extra-deps:

5−- quickcheck-properties-0.1

6−- aeson-1.1.0.0

7−# - http-client-0.5.0

8−# - fail-4.9.0.0

9−# - http-types-0.9

10−# - attoparsec-0.13.0.1

11−# - doctest-0.10.1

12−# - semigroups-0.18.0.1

13−# - uri-bytestring-0.1.9

14−# - temporary-resourcet-0.1.0.0

15−resolver: nightly-2016-08-20