From fa407775971b4f710df2c8ec9b47fcc5469fab3e Mon Sep 17 00:00:00 2001 From: Nathan Youngman Date: Tue, 30 Dec 2014 16:07:48 -0700 Subject: [PATCH 1/2] test against Ruby 2.2 and Rails 4.2 --- .travis.yml | 4 ++++ test/gemfiles/Gemfile.rails-3.2.x | 2 +- test/gemfiles/Gemfile.rails-4.0.x | 2 +- test/gemfiles/Gemfile.rails-4.1.x | 2 +- test/gemfiles/Gemfile.rails-4.2.x | 5 +++++ 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 test/gemfiles/Gemfile.rails-4.2.x diff --git a/.travis.yml b/.travis.yml index eb9f9e1..7629fb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,17 @@ rvm: - 1.9.3 - 2.0.0 - 2.1.5 + - 2.2.0 - jruby-19mode gemfile: - test/gemfiles/Gemfile.rails-3.2.x - test/gemfiles/Gemfile.rails-4.0.x - test/gemfiles/Gemfile.rails-4.1.x + - test/gemfiles/Gemfile.rails-4.2.x matrix: exclude: - rvm: 1.9.3 gemfile: spec/gemfiles/rails-4.1.x.gemfile + - rvm: 1.9.3 + gemfile: spec/gemfiles/rails-4.2.x.gemfile fast_finish: true diff --git a/test/gemfiles/Gemfile.rails-3.2.x b/test/gemfiles/Gemfile.rails-3.2.x index 807d508..307b006 100644 --- a/test/gemfiles/Gemfile.rails-3.2.x +++ b/test/gemfiles/Gemfile.rails-3.2.x @@ -1,5 +1,5 @@ source "https://rubygems.org" gemspec :path => "./../.." -gem "activesupport", "3.2.21" +gem "activesupport", "~> 3.2.21" gem 'coveralls', :require => false diff --git a/test/gemfiles/Gemfile.rails-4.0.x b/test/gemfiles/Gemfile.rails-4.0.x index d0ba550..3f5cd39 100644 --- a/test/gemfiles/Gemfile.rails-4.0.x +++ b/test/gemfiles/Gemfile.rails-4.0.x @@ -1,5 +1,5 @@ source "https://rubygems.org" gemspec :path => "./../.." -gem "activesupport", "4.0.12" +gem "activesupport", "~> 4.0.12" gem 'coveralls', :require => false diff --git a/test/gemfiles/Gemfile.rails-4.1.x b/test/gemfiles/Gemfile.rails-4.1.x index 968e056..8fb28f7 100644 --- a/test/gemfiles/Gemfile.rails-4.1.x +++ b/test/gemfiles/Gemfile.rails-4.1.x @@ -1,5 +1,5 @@ source "https://rubygems.org" gemspec :path => "./../.." -gem "activesupport", "4.1.8" +gem "activesupport", "~> 4.1.8" gem 'coveralls', :require => false diff --git a/test/gemfiles/Gemfile.rails-4.2.x b/test/gemfiles/Gemfile.rails-4.2.x new file mode 100644 index 0000000..929aa13 --- /dev/null +++ b/test/gemfiles/Gemfile.rails-4.2.x @@ -0,0 +1,5 @@ +source "https://rubygems.org" +gemspec :path => "./../.." + +gem "activesupport", "~> 4.2.0" +gem 'coveralls', :require => false From 83728647e812a034ba804d42e1a477ec75459f22 Mon Sep 17 00:00:00 2001 From: Nathan Youngman Date: Tue, 30 Dec 2014 16:10:51 -0700 Subject: [PATCH 2/2] faster travis ci --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7629fb4..e0d55b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: ruby script: bundle exec rake rvm: