From 0ad40b460f32382175b77dd3bcbe8ac7e9e1f3e8 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:10:54 -0500 Subject: [PATCH 01/11] containerize pls --- .travis.yml | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5da91bb..b95e5de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ -# NB: don't set `language: haskell` here +sudo: false -# See also https://github.com/hvr/multi-ghc-travis for more information +addons: + apt: + packages: + - libgmp-dev + - openjdk-6-jre -# The following lines enable several GHC versions and/or HP versions -# to be tested; often it's enough to test only against the last -# release of a major GHC version. Setting HPVER implictly sets -# GHCVER. Omit lines with versions you don't need/want testing for. env: # - GHCVER=7.6.3 ESVER=1.6.0 # Deprecated # - GHCVER=7.8.3 ESVER=1.0.3 # Deprecated @@ -17,30 +17,20 @@ env: - GHCVER=7.10 ESVER=1.6.0 - GHCVER=7.10 ESVER=1.7.2 -# services: -# - elasticsearch - -# Note: the distinction between `before_install` and `install` is not -# important. -before_install: - - export STACK_YAML=stack-$GHCVER.yaml - - wget -q -O- https://s3.amazonaws.com/download.fpcomplete.com/ubuntu/fpco.key | sudo apt-key add - - - echo 'deb http://download.fpcomplete.com/ubuntu/precise stable main' | sudo tee /etc/apt/sources.list.d/fpco.list - - sudo apt-get update - - sudo apt-get install stack -y - - stack setup - - stack update - - wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ESVER.deb - - sudo dpkg --force-all -i elasticsearch-$ESVER.deb - - sudo service elasticsearch start - install: - - stack build + # stack + - export STACK_YAML=stack-$GHCVER.yaml + - mkdir -p ~/.local/bin + - travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v0.1.4.0/stack-0.1.4.0-x86_64-linux.tar.gz | tar -xvzf - + - mv stack ~/.local/bin + - export PATH=~/.local/bin:$PATH + - stack --version + + # elasticsearch + - wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.0.0/elasticsearch-$ESVER.tar.gz + - ./elasticsearch-$ESVER/bin/elasticsearch -# Here starts the actual work to be performed for the package under -# test; any command which exits with a non-zero exit code causes the -# build to fail. script: - - stack test - -# EOF + - stack setup + - stack build + - stack test From bc93324bbcaf680d75238868f943bdb2f547b88f Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:13:18 -0500 Subject: [PATCH 02/11] Fix URL --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b95e5de..1f065cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: - stack --version # elasticsearch - - wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.0.0/elasticsearch-$ESVER.tar.gz + - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ESVER.tar.gz - ./elasticsearch-$ESVER/bin/elasticsearch script: From c2403987a8bc08e3fd3b237b8162a29fe09dcd91 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:14:15 -0500 Subject: [PATCH 03/11] ls the directory during install --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1f065cf..e0bcfb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ install: # elasticsearch - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ESVER.tar.gz + - ls - ./elasticsearch-$ESVER/bin/elasticsearch script: From 57f1cd5b09d5264f2f993ceff563745056796f79 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:15:33 -0500 Subject: [PATCH 04/11] for the love of god travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e0bcfb0..aab95fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: # elasticsearch - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ESVER.tar.gz - - ls + - echo `ls -alh` - ./elasticsearch-$ESVER/bin/elasticsearch script: From 972a80077c85f68ba417b1ebb51697224dede1cb Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:17:00 -0500 Subject: [PATCH 05/11] expand the tarball, derp --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aab95fb..a66b667 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: # elasticsearch - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ESVER.tar.gz - - echo `ls -alh` + - tar -xzf elasticsearch-$ESVER.tar.gz - ./elasticsearch-$ESVER/bin/elasticsearch script: From b24546efd42af4274ed824302e840829b577e907 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:17:11 -0500 Subject: [PATCH 06/11] no dash --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a66b667..46e9f99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: # elasticsearch - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ESVER.tar.gz - - tar -xzf elasticsearch-$ESVER.tar.gz + - tar xzf elasticsearch-$ESVER.tar.gz - ./elasticsearch-$ESVER/bin/elasticsearch script: From e28b0454de3612fed6bae5a57f067be368163926 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:19:40 -0500 Subject: [PATCH 07/11] background the server --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 46e9f99..174fbec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ install: # elasticsearch - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ESVER.tar.gz - tar xzf elasticsearch-$ESVER.tar.gz - - ./elasticsearch-$ESVER/bin/elasticsearch + - ./elasticsearch-$ESVER/bin/elasticsearch & script: - stack setup From eb97a832321129b8e3843b75e1f2010f3bf5b0a2 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:37:56 -0500 Subject: [PATCH 08/11] lets see if 2.0.0 works --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 174fbec..f0ffcd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: - GHCVER=7.10 ESVER=1.5.2 - GHCVER=7.10 ESVER=1.6.0 - GHCVER=7.10 ESVER=1.7.2 + - GHCVER=7.10 ESVER=2.0.0 install: # stack From 68abd075099bfe6c16ddfb69638d50c66be478ba Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Oct 2015 19:49:53 -0500 Subject: [PATCH 09/11] they changed URL scheme. sigh --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0ffcd0..174fbec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ env: - GHCVER=7.10 ESVER=1.5.2 - GHCVER=7.10 ESVER=1.6.0 - GHCVER=7.10 ESVER=1.7.2 - - GHCVER=7.10 ESVER=2.0.0 install: # stack From a8401fcf0f1defdd8093417f1c70ad0c7964898d Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Thu, 29 Oct 2015 14:54:07 -0500 Subject: [PATCH 10/11] cache pls --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5da91bb..7fecb4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,4 +43,7 @@ install: script: - stack test -# EOF + # Caching so the next build will be fast too. +cache: + directories: + - $HOME/.stack From d4e70617b0a5650c48bf11b9f395bfd60a245954 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Thu, 29 Oct 2015 15:18:02 -0500 Subject: [PATCH 11/11] bump copyright --- bloodhound.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bloodhound.cabal b/bloodhound.cabal index 45aa12a..e779bf3 100644 --- a/bloodhound.cabal +++ b/bloodhound.cabal @@ -7,7 +7,7 @@ license: BSD3 license-file: LICENSE author: Chris Allen maintainer: cma@bitemyapp.com -copyright: 2014, Chris Allen +copyright: 2015, Chris Allen category: Database, Search build-type: Custom cabal-version: >=1.10