From e4679c66565d0ccae54ffc58a23083841e5585e7 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 31 Mar 2015 10:52:07 -0700 Subject: fix travis: use couchdb.admin.yml and pin travis ruby version to one that is installed on travis-ci.org --- .travis.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 90822f3..189a4c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,13 @@ services: notifications: email: false before_script: - - "test/setup_couch.sh" - - "mv test/config/couchdb.yml.admin config/couchdb.yml" - - "bundle exec rake RAILS_ENV=test couchrest:migrate_with_proxies" - - "mv test/config/couchdb.yml.user config/couchdb.yml" + - "rm .ruby-version" + - "mv test/travis/ruby-version .ruby-version" + - "test/travis/setup_couch.sh" + - "mv test/config/couchdb.admin.yml config/couchdb.admin.yml" + - "mv test/config/couchdb.yml config/couchdb.yml" + - "bundle exec rake RAILS_ENV=test db:rotate" + - "bundle exec rake RAILS_ENV=test db:migrate" after_script: - "cat tmp/*.test*.log" # printing logs from the failed integration tests -bundler_args: --without development debug \ No newline at end of file +bundler_args: --without development debug -- cgit v1.2.3