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 /.gitlab-ci.yml | |
| parent | 1457fcdae08a1cd7e1e7b36668f826547d2c7cf6 (diff) | |
| parent | 75ef60dbf0c12841118065994f381fad110f8307 (diff) | |
Merge branch 'cleanup/ci-files' into 'develop'
Cleanup/ci files
See merge request !3
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01c4103..45b5fd6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ services: # Cache gems in between builds cache: paths: - - vendor/ruby + - vendor/ # This is a basic example for a gem or script which doesn't use # services such as redis or postgres @@ -20,8 +20,8 @@ before_script: - ruby -v - curl -s couchdb:5984 - git submodule update --init - - cp test/config/gitlab/couchdb.yml config/couchdb.admin.yml - - cp test/config/gitlab/couchdb.yml config + - cp config/ci/gitlab/couchdb.yml config/couchdb.admin.yml + - cp config/ci/gitlab/couchdb.yml config - gem install bundler --no-ri --no-rdoc - bundle install -j $(nproc) --path vendor --without development debug - bundle exec rake RAILS_ENV=test db:rotate |