diff options
| author | azul <azul@riseup.net> | 2016-08-15 09:26:39 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2016-08-15 09:26:39 +0000 |
| commit | 1457fcdae08a1cd7e1e7b36668f826547d2c7cf6 (patch) | |
| tree | 59b563bc3f10ed7d2438f6284f96478c592d3ddf /.travis.yml | |
| parent | a1d62a3a1492ca21e1e1d2344fac88bb4d93f324 (diff) | |
| parent | 75c037e5d6d8b8f2b98477bdd0359f5687bd7517 (diff) | |
Merge branch 'test/gitlab-ci' into 'develop'
[ci] get gitlab to run tests
See merge request !2
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 4e7aad0..2681951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ before_install: - "gem install bundler --version 1.11.2" before_script: - "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" + - "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" - "bundle exec rake RAILS_ENV=test db:rotate" - "bundle exec rake RAILS_ENV=test db:migrate" after_script: |