summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-03-31 10:52:07 -0700
committerelijah <elijah@riseup.net>2015-03-31 10:52:07 -0700
commite4679c66565d0ccae54ffc58a23083841e5585e7 (patch)
tree2cc7fbb5d3e6a48d21a605a8411da38ea8c999e3 /.travis.yml
parent2365129a1dcbb1231f0ac22d4bf975007a0c460d (diff)
fix travis: use couchdb.admin.yml and pin travis ruby version to one that is installed on travis-ci.org
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 8 insertions, 5 deletions
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