From 94031e9df4b3083f87e88c0753e52414fe717211 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Tue, 18 Nov 2014 22:01:06 -0800 Subject: [PATCH] Moved to travis script to separate directory and use bash --- .travis.yml | 2 +- ci/nobrainer.sh | 10 ++++++++++ test/nobrainer.sh | 10 ---------- 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100755 ci/nobrainer.sh delete mode 100755 test/nobrainer.sh diff --git a/.travis.yml b/.travis.yml index cc8505d..5da0f53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +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 - - ./test/nobrainer.sh + - ./ci/nobrainer.sh script: bundle exec rake test before_script: - psql -c 'create database searchkick_test;' -U postgres diff --git a/ci/nobrainer.sh b/ci/nobrainer.sh new file mode 100755 index 0000000..e80c6c5 --- /dev/null +++ b/ci/nobrainer.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if [ -n "$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 diff --git a/test/nobrainer.sh b/test/nobrainer.sh deleted file mode 100755 index f85dd18..0000000 --- a/test/nobrainer.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env sh - -if [ -n "$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