Download as
Browse Code »

Commit a97f8e194ff0d9c2b83e95f679021087ad719f41

Authored by Braulio Bhavamitra
1 parent bfa27a7b
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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