Skip to content

Commit

Permalink
Merge pull request SchemaPlus#105 from steveklabnik/master
Browse files Browse the repository at this point in the history
Run tests against Rails 4.
  • Loading branch information
ronen committed May 3, 2013
2 parents 900cbbe + 7904df8 commit 06256c7
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ gemfile:
- gemfiles/rails-3.2/Gemfile.sqlite3
- gemfiles/rails-3.2/Gemfile.mysql
- gemfiles/rails-3.2/Gemfile.mysql2
- gemfiles/rails-4.0/Gemfile.postgresql
- gemfiles/rails-4.0/Gemfile.sqlite3
- gemfiles/rails-4.0/Gemfile.mysql
- gemfiles/rails-4.0/Gemfile.mysql2
before_script:
- rake create_databases
after_script:
Expand All @@ -15,3 +19,9 @@ notifications:
recipients:
- [email protected]
- [email protected]
matrix:
allow_failures:
- gemfile: gemfiles/rails-4.0/Gemfile.postgresql
- gemfile: gemfiles/rails-4.0/Gemfile.sqlite3
- gemfile: gemfiles/rails-4.0/Gemfile.mysql
- gemfile: gemfiles/rails-4.0/Gemfile.mysql2
4 changes: 4 additions & 0 deletions gemfiles/rails-4.0/Gemfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source 'https://rubygems.org'

gemspec :path => File.expand_path('../../..', __FILE__)
gem "rails", ">= 4.0.0", :github => "rails/rails"
4 changes: 4 additions & 0 deletions gemfiles/rails-4.0/Gemfile.mysql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

gem "mysql", "~> 2.8.1"
4 changes: 4 additions & 0 deletions gemfiles/rails-4.0/Gemfile.mysql2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

gem "mysql2"
4 changes: 4 additions & 0 deletions gemfiles/rails-4.0/Gemfile.postgresql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

gem "pg"
4 changes: 4 additions & 0 deletions gemfiles/rails-4.0/Gemfile.sqlite3
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

gem "sqlite3"

0 comments on commit 06256c7

Please sign in to comment.