Download as
Browse Code »

Commit 8c31af4c7831eb77194a956c3a4955026a607e37

Authored by Braulio Bhavamitra
1 parent e1b6eb78
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: 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 2 - mkdir -p tmp/pids log
3 3 - bundle check || bundle install
4 4 - script/noosfero-plugins disableall
5   - - rm -f tmp/makemo.stamp && rake makemo &>/dev/null
  5 + - bundle exec rake makemo &>/dev/null
6 6 # database
7 7 - cp config/database.yml.gitlab-ci config/database.yml
8 8 - createdb gitlab_ci_test || true
... ...
.travis.yml
  Diff comments   View file @8c31af4
... ... @@ -2,12 +2,26 @@ language: ruby
2 2 rvm:
3 3 # for 2.2 support we need to upgrade the pg gem
4 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 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 25 # selenium support
12 26 - export DISPLAY=:99.0
13 27 - sh -e /etc/init.d/xvfb start
... ... @@ -16,12 +30,12 @@ before_script:
16 30 - mkdir -p tmp/pids log
17 31 - bundle check || bundle install
18 32 - script/noosfero-plugins disableall
19   - - rake makemo
  33 + - bundle exec rake makemo &>/dev/null
20 34 # database
21 35 - cp config/database.yml.travis config/database.yml
22 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 40 env:
27 41 - TASK=test:units
... ...
Gemfile
  Diff comments   View file @8c31af4
... ... @@ -18,7 +18,7 @@ gem 'exception_notification', '~> 4.0.1'
18 18 gem 'gettext', '~> 2.2.1', :require => false
19 19 gem 'locale', '~> 2.0.5'
20 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 23 # asset pipeline
24 24 gem 'uglifier', '>= 1.0.3'
... ...