Download as
Browse Code »

Commit a97f8e194ff0d9c2b83e95f679021087ad719f41

Authored by Braulio Bhavamitra
1 parent bfa27a7b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

CI: fix gitlab build configuration

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
.gitlab-ci.yml
  Diff comments   View file @a97f8e1
1 -before_install: 1 +before_script:
2 - mkdir -p tmp/pids log 2 - mkdir -p tmp/pids log
3 - script/noosfero-plugins disableall 3 - script/noosfero-plugins disableall
4 - bundle check || bundle install 4 - bundle check || bundle install
5 # database 5 # database
6 - cp config/database.yml.gitlab-ci config/database.yml 6 - cp config/database.yml.gitlab-ci config/database.yml
7 - - dropdb gitlab_ci_test  
8 - - createdb gitlab_ci_test 7 + - createdb gitlab_ci_test || true
9 - bundle exec rake db:schema:load 8 - bundle exec rake db:schema:load
10 - bundle exec rake db:migrate 9 - bundle exec rake db:migrate
11 10
config/database.yml.gitlab-ci
  Diff comments   View file @a97f8e1
1 -# From http://about.travis-ci.org/docs/user/database-setup/  
2 -test: 1 +test: &TEST
3 adapter: postgresql 2 adapter: postgresql
4 database: gitlab_ci_test 3 database: gitlab_ci_test
5 - username: postgres 4 + username: gitlab_ci_runner
  5 +development:
  6 + <<: *TEST