From a97f8e194ff0d9c2b83e95f679021087ad719f41 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Tue, 23 Jun 2015 00:30:32 -0300 Subject: [PATCH] CI: fix gitlab build configuration --- .gitlab-ci.yml | 5 ++--- config/database.yml.gitlab-ci | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28d7d4e..a856e5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,10 @@ -before_install: +before_script: - mkdir -p tmp/pids log - script/noosfero-plugins disableall - bundle check || bundle install # database - cp config/database.yml.gitlab-ci config/database.yml - - dropdb gitlab_ci_test - - createdb gitlab_ci_test + - createdb gitlab_ci_test || true - bundle exec rake db:schema:load - bundle exec rake db:migrate diff --git a/config/database.yml.gitlab-ci b/config/database.yml.gitlab-ci index 585b2fb..e419748 100644 --- a/config/database.yml.gitlab-ci +++ b/config/database.yml.gitlab-ci @@ -1,5 +1,6 @@ -# From http://about.travis-ci.org/docs/user/database-setup/ -test: +test: &TEST adapter: postgresql database: gitlab_ci_test - username: postgres + username: gitlab_ci_runner +development: + <<: *TEST -- libgit2 0.21.2