From bef746ae7b215db78be088657bbfaf47c774f943 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 8 Aug 2016 10:25:54 +0200 Subject: [ci] setup couch for gitlab Couch docker image will be available on the host called couchdb. So we use curl to check for it and display the version string. And then we move a couchdb.yml config file into place so the right host will be used. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.travis.yml') 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: -- cgit v1.2.3 From 58c63cac98cdacc6ec7230e1133bcb35f0f22582 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 15 Aug 2016 11:31:40 +0200 Subject: [ci] move configs into config dir --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 2681951..ecf2c16 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/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" + - "mv config/ci/travis/ruby-version .ruby-version" + - "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: -- cgit v1.2.3 From 29133bb6f54c58271292794a72e65399488783c0 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 15 Aug 2016 11:34:01 +0200 Subject: cleanup: remove outdated travis setup --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ecf2c16..ab5f78b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,7 @@ services: - couchdb notifications: email: false -before_install: - - "gem install bundler --version 1.11.2" before_script: - - "rm .ruby-version" - - "mv config/ci/travis/ruby-version .ruby-version" - "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" -- cgit v1.2.3 From 598d73f462a21618c01ea8afd76ebec0bc999298 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 15 Aug 2016 12:04:34 +0200 Subject: [ci] fix travis by using container builds This is supposed to fix the bundler error reported in https://github.com/bundler/bundler/issues/3558 sudo: false makes travis use the new infrastructure without sudo --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ab5f78b..fbc4e06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false services: - couchdb notifications: -- cgit v1.2.3