Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test on Rails 5.2 & fix mysql for older Rails #304

Merged
merged 3 commits into from
Mar 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ cache: bundler
sudo: false
language: ruby
rvm:
- 2.4.0
- 2.3.3
- 2.2.7
- 2.6.0
- 2.5.0
- 2.4.3
- 2.3.6
- 2.2.9
# these haven't been passing for a while:
# - jruby-head
# - rbx

gemfile:
- gemfiles/activerecord_5.2.gemfile
- gemfiles/activerecord_5.1.gemfile
- gemfiles/activerecord_5.0.gemfile
- gemfiles/activerecord_4.2.gemfile
Expand All @@ -27,3 +30,4 @@ matrix:
- gemfile: gemfiles/activerecord_edge.gemfile
- rvm: jruby-head
- rvm: rbx
- rvm: 2.6.0
2 changes: 1 addition & 1 deletion gemfiles/activerecord_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "activerecord", "~> 4.2.0"

platforms :ruby, :rbx do
gem "mysql2"
gem "mysql2", '~> 0.4.10'
gem "pg", '~> 0.21.0'
gem "sqlite3"
end
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/activerecord_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "activerecord", "~> 5.0.0"

platforms :ruby, :rbx do
gem "mysql2"
gem "mysql2", '~> 0.4.10'
gem "pg", '~> 0.21.0'
gem "sqlite3"
end
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/activerecord_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "activerecord", "~> 5.1.0"

platforms :ruby, :rbx do
gem "mysql2"
gem "mysql2", '~> 0.4.10'
gem "pg"
gem "sqlite3"
end
Expand Down
19 changes: 19 additions & 0 deletions gemfiles/activerecord_5.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", '~> 5.2.0.rc2'

platforms :ruby, :rbx do
gem "mysql2", '~> 0.4.10'
gem "pg"
gem "sqlite3"
end

platforms :jruby do
gem "activerecord-jdbcmysql-adapter"
gem "activerecord-jdbcpostgresql-adapter"
gem "activerecord-jdbcsqlite3-adapter"
end

gemspec :path => "../"