Download as
Browse Code »

Commit 010e1ee54171523d6052e3f278174cc92808e4ba

Authored by Braulio Bhavamitra
1 parent e7baba6e
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: compile translations (fix cucumber tests)

Showing 2 changed files with 13 additions and 11 deletions   Show diff stats
.gitlab-ci.yml
  Diff comments   View file @010e1ee
1 1 before_script:
2 2 - mkdir -p tmp/pids log
3   - - script/noosfero-plugins disableall
4 3 - bundle check || bundle install
  4 + - script/noosfero-plugins disableall
  5 + - rm -f tmp/makemo.stamp && rake makemo &>/dev/null
5 6 # database
6 7 - cp config/database.yml.gitlab-ci config/database.yml
7 8 - createdb gitlab_ci_test || true
8   - - bundle exec rake db:schema:load
9   - - bundle exec rake db:migrate
  9 + - bundle exec rake db:schema:load &>/dev/null
  10 + - bundle exec rake db:migrate &>/dev/null
10 11  
11 12 units:
12   - script: 'bundle exec rake test:units'
  13 + script: bundle exec rake test:units
13 14 functionals:
14   - script: 'bundle exec rake test:functionals'
  15 + script: bundle exec rake test:functionals
15 16 integration:
16   - script: 'bundle exec rake test:integration'
  17 + script: bundle exec rake test:integration
17 18 cucumber:
18   - script: 'bundle exec rake cucumber'
  19 + script: bundle exec rake cucumber
19 20 selenium:
20   - script: 'bundle exec rake selenium'
  21 + script: bundle exec rake selenium
21 22 plugins:
22   - script: 'bundle exec rake test:noosfero_plugins'
  23 + script: bundle exec rake test:noosfero_plugins
23 24  
... ...
.travis.yml
  Diff comments   View file @010e1ee
... ... @@ -6,7 +6,7 @@ rvm:
6 6 before_install:
7 7 # dependencies
8 8 - sudo apt-get update
9   - - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data openjdk-6-jre curl wget
  9 + - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data default-jre
10 10 - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
11 11 # selenium support
12 12 - export DISPLAY=:99.0
... ... @@ -14,8 +14,9 @@ before_install:
14 14  
15 15 before_script:
16 16 - mkdir -p tmp/pids log
17   - - script/noosfero-plugins disableall
18 17 - bundle check || bundle install
  18 + - script/noosfero-plugins disableall
  19 + - rake makemo
19 20 # database
20 21 - cp config/database.yml.travis config/database.yml
21 22 - psql -c 'create database myapp_test;' -U postgres
... ...