Skip to content

Commit

Permalink
Merge pull request sunspot#428 from sunspot/test-with-latest-rails
Browse files Browse the repository at this point in the history
Update travis and gemfiles so now runs the latest Rails version in all cases
  • Loading branch information
brutuscat committed Jul 7, 2013
2 parents f3ae625 + cf5c29e commit 5488725
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ rvm:

env:
- GEM=sunspot
- GEM=sunspot_rails RAILS=2.3.16
- GEM=sunspot_rails RAILS=3.0.20
- GEM=sunspot_rails RAILS=3.1.10
- GEM=sunspot_rails RAILS=3.2.11
- GEM=sunspot_rails RAILS=2.3.0
- GEM=sunspot_rails RAILS=3.0.0
- GEM=sunspot_rails RAILS=3.1.0
- GEM=sunspot_rails RAILS=3.2.0

# Limit the size of the matrix by only performing the most common builds
matrix:
exclude:
# Not supporting Ruby 1.8.7 + Rails >= 3
- rvm: 1.8.7
env: GEM=sunspot_rails RAILS=3.0.20
env: GEM=sunspot_rails RAILS=3.0.0
- rvm: 1.8.7
env: GEM=sunspot_rails RAILS=3.1.10
env: GEM=sunspot_rails RAILS=3.1.0
- rvm: 1.8.7
env: GEM=sunspot_rails RAILS=3.2.11
env: GEM=sunspot_rails RAILS=3.2.0
- rvm: 1.9.3
env: GEM=sunspot_rails RAILS=2.3.16
env: GEM=sunspot_rails RAILS=2.3.0
# Not supporting Ruby 2.0 and Rails < 3
- rvm: 2.0.0
env: GEM=sunspot_rails RAILS=2.3.16
env: GEM=sunspot_rails RAILS=2.3.0
- rvm: 2.0.0
env: GEM=sunspot_rails RAILS=3.0.20
env: GEM=sunspot_rails RAILS=3.0.0
- rvm: 2.0.0
env: GEM=sunspot_rails RAILS=3.1.10
env: GEM=sunspot_rails RAILS=3.1.0

script:
- ci/travis.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'http://rubygems.org'

gem 'iconv', :platform => :mri_20
gem 'rails', '2.3.16'
gem 'rails', '~> 2.3.0'
gem 'sqlite3', '~> 1.3.7'

gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.0.20'
gem 'rails', '~> 3.0.0'
gem 'sqlite3', '~> 1.3.7'

gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.10'
gem 'rails', '~> 3.1.0'
gem 'sqlite3', '~> 1.3.7'

gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.2.11'
gem 'rails', '~> 3.2.0'
gem 'sqlite3', '~> 1.3.7'

gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
Expand Down

0 comments on commit 5488725

Please sign in to comment.