Skip to content

Commit 6ff8d9c

Browse files
authored
Merge pull request #79 from yuki24/test-against-more-rubies-and-rails
Test against Ruby 2.6 and Rails 5.2
2 parents 183f841 + b33abb7 commit 6ff8d9c

File tree

5 files changed

+29
-3
lines changed

5 files changed

+29
-3
lines changed

.travis.yml

+12
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,29 @@ rvm:
99
- 2.3
1010
- 2.4
1111
- 2.5
12+
- 2.6
1213

1314
env:
1415
- RAILS_VERSION=4.2
1516
- RAILS_VERSION=5.0
1617
- RAILS_VERSION=5.1
18+
- RAILS_VERSION=5.2
1719

1820
matrix:
1921
exclude:
2022
- rvm: 2.2
2123
env: RAILS_VERSION=5.0
2224
- rvm: 2.2
2325
env: RAILS_VERSION=5.1
26+
- rvm: 2.2
27+
env: RAILS_VERSION=5.2
28+
- rvm: 2.5
29+
env: RAILS_VERSION=4.2
30+
- rvm: 2.5
31+
env: RAILS_VERSION=5.0
32+
- rvm: 2.6
33+
env: RAILS_VERSION=4.2
34+
- rvm: 2.6
35+
env: RAILS_VERSION=5.0
2436

2537
sudo: false

gemfiles/4.2.gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
gem 'puma'
12
gem 'jquery-rails'
23
gem 'jquery-ui-rails'
34
gem 'ancestry'
4-
gem 'sqlite3'
5+
gem 'sqlite3', '~> 1.3.6'
56

67
gem 'activeadmin'
78
gem 'devise'

gemfiles/5.0.gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
gem 'puma'
12
gem 'jquery-rails'
23
gem 'jquery-ui-rails'
34
gem 'ancestry'
4-
gem 'sqlite3'
5+
gem 'sqlite3', '~> 1.3.6'
56

67
gem 'activeadmin'
78
gem 'devise'

gemfiles/5.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gem 'puma'
22
gem 'jquery-rails'
33
gem 'jquery-ui-rails'
44
gem 'ancestry'
5-
gem 'sqlite3'
5+
gem 'sqlite3', '~> 1.3.6'
66

77
gem 'activeadmin'
88
gem 'devise'

gemfiles/5.2.gemfile

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
gem 'puma'
2+
gem 'jquery-rails'
3+
gem 'jquery-ui-rails'
4+
gem 'ancestry'
5+
gem 'sqlite3', '~> 1.3.6'
6+
7+
gem 'activeadmin'
8+
gem 'devise'
9+
gem 'rails', '~> 5.2.0'
10+
gem 'sass-rails'
11+
12+
# vim: ft=ruby

0 commit comments

Comments
 (0)