Skip to content

Commit

Permalink
Add Rails 4.1.0.beta1. Get Rubinius build running. Enable supported c…
Browse files Browse the repository at this point in the history
…onfigurations for Rubinius and JRuby.
  • Loading branch information
petergoldstein committed Dec 27, 2013
1 parent 49fc5c7 commit 440b21e
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -6,8 +6,10 @@ coverage
pkg
rdoc
Gemfile.lock
gemfiles/*.lock
spec/debug.log
spec/*.db
TODO
.rvmrc
.ruby-version
alto
11 changes: 6 additions & 5 deletions .travis.yml
Expand Up @@ -5,6 +5,7 @@ rvm:
- 1.9.2
- 1.9.3
- 2.0.0
- 2.1.0
# - jruby-18mode # JRuby in 1.8 mode
- jruby-19mode # JRuby in 1.9 mode
- rbx-2.2.1
Expand All @@ -14,16 +15,16 @@ services: mongodb
gemfile:
- gemfiles/rails_3.2.gemfile
- gemfiles/rails_4.0.gemfile
- gemfiles/rails_4.1.gemfile

matrix:
allow_failures:
- rvm: rbx-2.2.1
- rvm: jruby-19mode
exclude:
- { rvm: 1.8.7, gemfile: gemfiles/rails_4.0.gemfile }
- { rvm: 1.8.7, gemfile: gemfiles/rails_4.1.gemfile }
- { rvm: 1.9.2, gemfile: gemfiles/rails_4.0.gemfile }
- { rvm: 1.9.3, gemfile: gemfiles/rails_4.0.gemfile }
- { rvm: jruby-19mode, gemfile: gemfiles/rails_3.2.gemfile }
- { rvm: jruby-19mode, gemfile: gemfiles/rails_4.0.gemfile }
- { rvm: rbx-2.2.1, gemfile: gemfiles/rails_3.2.gemfile }
- { rvm: rbx-2.2.1, gemfile: gemfiles/rails_4.0.gemfile }
- { rvm: 1.9.2, gemfile: gemfiles/rails_4.1.gemfile }
- { rvm: 1.9.3, gemfile: gemfiles/rails_4.1.gemfile }
- { rvm: jruby-19mode, gemfile: gemfiles/rails_4.1.gemfile }
5 changes: 3 additions & 2 deletions gemfiles/rails_3.2.gemfile
@@ -1,11 +1,12 @@
source "https://rubygems.org"

gem "sqlite3", :platforms => :ruby
gem "coveralls", :platforms => :ruby
gem "coveralls"
gem 'rubysl', :platforms => :rbx
gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "3.2.15"
gem "rails", "3.2.16"
gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')

gemspec :path => "../"
5 changes: 3 additions & 2 deletions gemfiles/rails_4.0.gemfile
@@ -1,10 +1,11 @@
source "https://rubygems.org"

gem "sqlite3", :platforms => :ruby
gem "coveralls", :platforms => :ruby
gem "coveralls"
gem 'rubysl', :platforms => :rbx
gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.0.1"
gem "rails", "4.0.2"

gemspec :path => "../"
11 changes: 11 additions & 0 deletions gemfiles/rails_4.1.gemfile
@@ -0,0 +1,11 @@
source "https://rubygems.org"

gem "sqlite3", :platforms => :ruby
gem "coveralls"
gem 'rubysl', :platforms => :rbx
gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.1.0.beta1"

gemspec :path => "../"

0 comments on commit 440b21e

Please sign in to comment.