Skip to content

Commit

Permalink
Add rails 5.2 to testing setup
Browse files Browse the repository at this point in the history
  • Loading branch information
urkle committed Dec 7, 2018
1 parent 802be24 commit c35665a
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ gemfile:
- gemfiles/activerecord-5.1/Gemfile.mysql2
- gemfiles/activerecord-5.1/Gemfile.postgresql
- gemfiles/activerecord-5.1/Gemfile.sqlite3
- gemfiles/activerecord-5.2/Gemfile.mysql2
- gemfiles/activerecord-5.2/Gemfile.postgresql
- gemfiles/activerecord-5.2/Gemfile.sqlite3
env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
addons:
postgresql: '9.4'
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ As of version 1.2.0, SchemaValidations supports and is tested on:
<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **postgresql** or **sqlite3**
* ruby **2.3.1** with activerecord **5.1**, using **mysql2**, **postgresql** or **sqlite3**
* ruby **2.3.1** with activerecord **5.2**, using **mysql2**, **postgresql** or **sqlite3**

<!-- SCHEMA_DEV: MATRIX - end -->

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/activerecord-5.0/Gemfile.postgresql
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions gemfiles/activerecord-5.1/Gemfile.postgresql
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
3 changes: 3 additions & 0 deletions gemfiles/activerecord-5.2/Gemfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eval File.read File.expand_path('../../Gemfile.base', __FILE__)

gem "activerecord", ">= 5.2.0.beta0", "< 5.3"
10 changes: 10 additions & 0 deletions gemfiles/activerecord-5.2/Gemfile.mysql2
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "mysql2"
end

platform :jruby do
gem 'activerecord-jdbcmysql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-5.2/Gemfile.postgresql
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-5.2/Gemfile.sqlite3
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "sqlite3"
end

platform :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
end
1 change: 1 addition & 0 deletions schema_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ruby:
activerecord:
- 5.0
- 5.1
- 5.2
db:
- mysql2
- postgresql
Expand Down

0 comments on commit c35665a

Please sign in to comment.