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 | |
| parent | 1457fcdae08a1cd7e1e7b36668f826547d2c7cf6 (diff) | |
| parent | 75ef60dbf0c12841118065994f381fad110f8307 (diff) | |
Merge branch 'cleanup/ci-files' into 'develop'
Cleanup/ci files
See merge request !3
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | config/ci/gitlab/couchdb.yml (renamed from test/config/gitlab/couchdb.yml) | 0 | ||||
| -rw-r--r-- | config/ci/travis/README (renamed from test/config/README) | 0 | ||||
| -rw-r--r-- | config/ci/travis/couchdb.admin.yml (renamed from test/config/travis/couchdb.admin.yml) | 0 | ||||
| -rw-r--r-- | config/ci/travis/couchdb.yml (renamed from test/config/travis/couchdb.yml) | 0 | ||||
| -rwxr-xr-x | config/ci/travis/setup_couch.sh (renamed from test/config/travis/setup_couch.sh) | 0 | ||||
| -rw-r--r-- | test/config/travis/ruby-version | 1 |
8 files changed, 7 insertions, 11 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 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: diff --git a/test/config/gitlab/couchdb.yml b/config/ci/gitlab/couchdb.yml index 68761dc..68761dc 100644 --- a/test/config/gitlab/couchdb.yml +++ b/config/ci/gitlab/couchdb.yml diff --git a/test/config/README b/config/ci/travis/README index 58e37b2..58e37b2 100644 --- a/test/config/README +++ b/config/ci/travis/README diff --git a/test/config/travis/couchdb.admin.yml b/config/ci/travis/couchdb.admin.yml index a7677f9..a7677f9 100644 --- a/test/config/travis/couchdb.admin.yml +++ b/config/ci/travis/couchdb.admin.yml diff --git a/test/config/travis/couchdb.yml b/config/ci/travis/couchdb.yml index a57b888..a57b888 100644 --- a/test/config/travis/couchdb.yml +++ b/config/ci/travis/couchdb.yml diff --git a/test/config/travis/setup_couch.sh b/config/ci/travis/setup_couch.sh index 0502c12..0502c12 100755 --- a/test/config/travis/setup_couch.sh +++ b/config/ci/travis/setup_couch.sh diff --git a/test/config/travis/ruby-version b/test/config/travis/ruby-version deleted file mode 100644 index 68b3a4c..0000000 --- a/test/config/travis/ruby-version +++ /dev/null @@ -1 +0,0 @@ -1.9.3-p551 |