diff --git a/.ruby-version b/.ruby-version index 7d2ed7c7..cd57a8b9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.4 +2.1.5 diff --git a/.travis.yml b/.travis.yml index 4bc87dd6..08c1c58f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,21 @@ language: ruby + sudo: false -rvm: -- 2.1.4 + +rvm: 2.1.5 + env: global: - - RUBY_GC_MALLOC_LIMIT=90000000 - - RUBY_GC_HEAP_FREE_SLOTS=200000 + - RUBY_GC_MALLOC_LIMIT=90000000 + - RUBY_GC_HEAP_FREE_SLOTS=200000 + cache: bundler + addons: postgresql: 9.3 + services: -- redis + - redis + before_script: -- 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace' -notifications: - irc: "irc.freenode.org#travis" + - 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace' diff --git a/Gemfile b/Gemfile index 43d10a2b..aa41780b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ source 'https://rubygems.org' gemspec +ruby "2.1.5" + gem 's3', github: 'travis-ci/s3' gem 'travis-core', github: 'travis-ci/travis-core'