git.iko.soy/typeable/bloodhound
on master help sign in
Merge remote-tracking branch 'upstream/master' into directGenerators
commit7f00743ad76d803229867a3ed6600d6935160a99 authorJosh Berman <berman.josh@gmail.com> dateSun 24 Dec 2017, 11:41 (9 years ago) parent2f94607ef1e61e
3 files changed+10−55
compare with master
unifiedsplit
.travis.yml+5−3 stack-8.2.yaml+4−39 stack.yaml+1−13
.travis.yml+5−3
@@ -16,13 +16,15 @@ env:
1616 - GHCVER=7.10 ESVER=1.5.2 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
1717 - GHCVER=7.10 ESVER=1.6.0 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
1818 - GHCVER=7.10 ESVER=1.7.6 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
19− - GHCVER=8.0 ESVER=1.7.6 STACK_YAML=stack.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
20− - 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"
19+ - GHCVER=8.0 ESVER=1.7.6 STACK_YAML=stack-8.0.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
20+ - GHCVER=8.0 ESVER=5.0.2 STACK_YAML=stack-8.0.yaml ESFLAG=ES5 DLINK=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch ES_JAVA_OPTS="-Xms500m -Xmx750m"
21+ - GHCVER=8.2 ESVER=1.7.6 STACK_YAML=stack.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
22+ - GHCVER=8.2 ESVER=5.0.2 STACK_YAML=stack.yaml ESFLAG=ES5 DLINK=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch ES_JAVA_OPTS="-Xms500m -Xmx750m"
2123
2224install:
2325 # stack
2426 - mkdir -p ~/.local/bin
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'
27+ - travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
2628 - export PATH=~/.local/bin:$PATH
2729 - stack --no-terminal --version
2830
stack-8.2.yaml+4−39
@@ -1,44 +1,9 @@
1−compiler: ghc-8.2.0.20170507
2−compiler-check: match-exact
3−resolver: lts-8.13
4−setup-info:
5− ghc:
6− linux64:
7− 8.2.0.20170507:
8− url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-deb8-linux.tar.xz
9− content-length: 141011788
10− sha1: ff886437c1d2ddfa5686d6c9efb0819a957c3dde
11− macosx:
12− 8.2.0.20170507:
13− url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-apple-darwin.tar.xz
14− content-length: 126192308
15− sha1: f059fe6f8a898d5619ab03e06e0ff0912a5f3340
16− windows64:
17− 8.2.0.20170507:
18− url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-unknown-mingw32.tar.xz
19− content-length: 177295548
20− sha1: 87646ca3a89278775ceb7be429faafac3cf738d8
21−
22−ghc-options: { "*": -XTypeSynonymInstances }
23−
241flags:
252 bloodhound-examples:
26− werror: false
27−
28−allow-newer: true
3+ werror: true
294
305packages:
31−- '.'
32−- './examples'
6+ - '.'
7+ - './examples'
338
34−extra-deps:
35−- http-client-0.5.0
36−- aeson-1.2.0.0
37−- fail-4.9.0.0
38−- http-types-0.9
39−- attoparsec-0.13.0.1
40−- quickcheck-properties-0.1
41−- semigroups-0.18.3
42−- uri-bytestring-0.1.9
43−- temporary-resourcet-0.1.0.0
44−- transformers-compat-0.5.1.4
9+resolver: lts-10.0
stack.yamlmode 100644 → 120000+1−13
@@ -1,13 +0,0 @@
1−flags:
2− bloodhound-examples:
3− werror: true
4−packages:
5−- '.'
6−- './examples'
7−extra-deps:
8−- hspec-2.4.1
9−- hspec-core-2.4.1
10−- hspec-discover-2.4.1
11−- quickcheck-properties-0.1
12−- vector-0.12.0.0
13−resolver: nightly-2017-01-30
@@ -0,0 +1 @@
1+stack-8.2.yaml