diff options
| author | azul <azul@riseup.net> | 2016-08-15 10:19:14 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2016-08-15 10:19:14 +0000 |
| commit | c14e6f65d7c991d00724873a4b6ab45b54a2e765 (patch) | |
| tree | 9b0e1b3d14dfd26557220699fc3987ec6ef9f3c7 /.travis.yml | |
| parent | 1457fcdae08a1cd7e1e7b36668f826547d2c7cf6 (diff) | |
| parent | 75ef60dbf0c12841118065994f381fad110f8307 (diff) | |
Merge branch 'cleanup/ci-files' into 'develop'
Cleanup/ci files
See merge request !3
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 2681951..fbc4e06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,12 @@ +sudo: false services: - couchdb notifications: email: false -before_install: - - "gem install bundler --version 1.11.2" before_script: - - "rm .ruby-version" - - "mv test/config/travis/ruby-version .ruby-version" - - "test/config/travis/setup_couch.sh" - - "mv test/config/travis/couchdb.admin.yml config/couchdb.admin.yml" - - "mv test/config/travis/couchdb.yml config/couchdb.yml" + - "config/ci/travis/setup_couch.sh" + - "mv config/ci/travis/couchdb.admin.yml config/couchdb.admin.yml" + - "mv config/ci/travis/couchdb.yml config/couchdb.yml" - "bundle exec rake RAILS_ENV=test db:rotate" - "bundle exec rake RAILS_ENV=test db:migrate" after_script: |