From c8d1c40c38158107da4e138fb06640abf1f1679b Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Tue, 18 Nov 2014 21:52:11 -0800 Subject: [PATCH] Only install RethinkDB when needed --- .travis.yml | 12 +++++------- test/nobrainer.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100755 test/nobrainer.sh diff --git a/.travis.yml b/.travis.yml index d1d9f64..64218a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,7 @@ services: - mongodb before_install: - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb && sudo dpkg -i elasticsearch-1.3.2.deb && sudo service elasticsearch restart - - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list - - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - - - sudo apt-get update -q - - sudo apt-get install rethinkdb - - sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf - - sudo service rethinkdb restart + - script ./test/nobrainer.sh script: bundle exec rake test before_script: - psql -c 'create database searchkick_test;' -U postgres @@ -27,4 +22,7 @@ gemfile: - gemfiles/mongoid2.gemfile - gemfiles/mongoid3.gemfile - gemfiles/mongoid4.gemfile - - gemfiles/nobrainer.gemfile +matrix: + include: + - gemfile: gemfiles/nobrainer.gemfile + env: NOBRAINER=true diff --git a/test/nobrainer.sh b/test/nobrainer.sh new file mode 100755 index 0000000..df54491 --- /dev/null +++ b/test/nobrainer.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +if [ ! -z "$NOBRAINER" ]; then + source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list + wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - + sudo apt-get update -q + sudo apt-get install rethinkdb + sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf + sudo service rethinkdb restart +fi -- libgit2 0.21.0