Download as
Browse Code »

Commit 8c31af4c7831eb77194a956c3a4955026a607e37

Authored by Braulio Bhavamitra
1 parent e1b6eb78
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: use new docker infrastructure on travis

Showing 3 changed files with 23 additions and 9 deletions   Show diff stats
.gitlab-ci.yml
  Diff comments   View file @8c31af4
@@ -2,7 +2,7 @@ before_script: @@ -2,7 +2,7 @@ before_script:
2 - mkdir -p tmp/pids log 2 - mkdir -p tmp/pids log
3 - bundle check || bundle install 3 - bundle check || bundle install
4 - script/noosfero-plugins disableall 4 - script/noosfero-plugins disableall
5 - - rm -f tmp/makemo.stamp && rake makemo &>/dev/null 5 + - bundle exec rake makemo &>/dev/null
6 # database 6 # database
7 - cp config/database.yml.gitlab-ci config/database.yml 7 - cp config/database.yml.gitlab-ci config/database.yml
8 - createdb gitlab_ci_test || true 8 - createdb gitlab_ci_test || true
@@ -2,12 +2,26 @@ language: ruby @@ -2,12 +2,26 @@ language: ruby
2 rvm: 2 rvm:
3 # for 2.2 support we need to upgrade the pg gem 3 # for 2.2 support we need to upgrade the pg gem
4 - 2.1.6 4 - 2.1.6
  5 +cache: bundler
  6 +
  7 +sudo: false
  8 +addons:
  9 + apt:
  10 + packages:
  11 + - po4a
  12 + - iso-codes
  13 + - tango-icon-theme
  14 + - pidgin-data
  15 + # for gem extensions
  16 + - libmagickwand-dev
  17 + - libpq-dev
  18 + - libreadline-dev
  19 + - libsqlite3-dev
  20 + - libxslt1-dev
5 21
6 before_install: 22 before_install:
7 -# dependencies  
8 - - sudo apt-get update  
9 - - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data default-jre  
10 - - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev 23 +# FIXME: workaround while https://github.com/travis-ci/travis-ci/issues/4210 is open
  24 + - rm config/initializers/default_icon_theme.rb
11 # selenium support 25 # selenium support
12 - export DISPLAY=:99.0 26 - export DISPLAY=:99.0
13 - sh -e /etc/init.d/xvfb start 27 - sh -e /etc/init.d/xvfb start
@@ -16,12 +30,12 @@ before_script: @@ -16,12 +30,12 @@ before_script:
16 - mkdir -p tmp/pids log 30 - mkdir -p tmp/pids log
17 - bundle check || bundle install 31 - bundle check || bundle install
18 - script/noosfero-plugins disableall 32 - script/noosfero-plugins disableall
19 - - rake makemo 33 + - bundle exec rake makemo &>/dev/null
20 # database 34 # database
21 - cp config/database.yml.travis config/database.yml 35 - cp config/database.yml.travis config/database.yml
22 - psql -c 'create database myapp_test;' -U postgres 36 - psql -c 'create database myapp_test;' -U postgres
23 - - bundle exec rake db:schema:load  
24 - - bundle exec rake db:migrate 37 + - bundle exec rake db:schema:load &>/dev/null
  38 + - bundle exec rake db:migrate &>/dev/null
25 39
26 env: 40 env:
27 - TASK=test:units 41 - TASK=test:units
@@ -18,7 +18,7 @@ gem 'exception_notification', '~> 4.0.1' @@ -18,7 +18,7 @@ gem 'exception_notification', '~> 4.0.1'
18 gem 'gettext', '~> 2.2.1', :require => false 18 gem 'gettext', '~> 2.2.1', :require => false
19 gem 'locale', '~> 2.0.5' 19 gem 'locale', '~> 2.0.5'
20 gem 'whenever', :require => false 20 gem 'whenever', :require => false
21 -gem 'eita-jrails', '>= 0.9.5', :require => 'jrails' 21 +gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
22 22
23 # asset pipeline 23 # asset pipeline
24 gem 'uglifier', '>= 1.0.3' 24 gem 'uglifier', '>= 1.0.3'