Skip to content

Commit a27b0a1

Browse files
authored
Merge pull request #304 from swrobel/rails-52
Test on Rails 5.2 & fix mysql for older Rails
2 parents 82d7ceb + 057ea11 commit a27b0a1

5 files changed

+29
-6
lines changed

.travis.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ cache: bundler
22
sudo: false
33
language: ruby
44
rvm:
5-
- 2.4.0
6-
- 2.3.3
7-
- 2.2.7
5+
- 2.6.0
6+
- 2.5.0
7+
- 2.4.3
8+
- 2.3.6
9+
- 2.2.9
810
# these haven't been passing for a while:
911
# - jruby-head
1012
# - rbx
1113

1214
gemfile:
15+
- gemfiles/activerecord_5.2.gemfile
1316
- gemfiles/activerecord_5.1.gemfile
1417
- gemfiles/activerecord_5.0.gemfile
1518
- gemfiles/activerecord_4.2.gemfile
@@ -27,3 +30,4 @@ matrix:
2730
- gemfile: gemfiles/activerecord_edge.gemfile
2831
- rvm: jruby-head
2932
- rvm: rbx
33+
- rvm: 2.6.0

gemfiles/activerecord_4.2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "activerecord", "~> 4.2.0"
66

77
platforms :ruby, :rbx do
8-
gem "mysql2"
8+
gem "mysql2", '~> 0.4.10'
99
gem "pg", '~> 0.21.0'
1010
gem "sqlite3"
1111
end

gemfiles/activerecord_5.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "activerecord", "~> 5.0.0"
66

77
platforms :ruby, :rbx do
8-
gem "mysql2"
8+
gem "mysql2", '~> 0.4.10'
99
gem "pg", '~> 0.21.0'
1010
gem "sqlite3"
1111
end

gemfiles/activerecord_5.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "activerecord", "~> 5.1.0"
66

77
platforms :ruby, :rbx do
8-
gem "mysql2"
8+
gem "mysql2", '~> 0.4.10'
99
gem "pg"
1010
gem "sqlite3"
1111
end

gemfiles/activerecord_5.2.gemfile

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", '~> 5.2.0.rc2'
6+
7+
platforms :ruby, :rbx do
8+
gem "mysql2", '~> 0.4.10'
9+
gem "pg"
10+
gem "sqlite3"
11+
end
12+
13+
platforms :jruby do
14+
gem "activerecord-jdbcmysql-adapter"
15+
gem "activerecord-jdbcpostgresql-adapter"
16+
gem "activerecord-jdbcsqlite3-adapter"
17+
end
18+
19+
gemspec :path => "../"

0 commit comments

Comments
 (0)