Skip to content

Commit d3b30b0

Browse files
committed
Travis updates
1 parent 4f93266 commit d3b30b0

File tree

4 files changed

+45
-40
lines changed

4 files changed

+45
-40
lines changed

.travis.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,64 +6,64 @@ matrix:
66
rvm: 2.3.8
77
gemfile: gemfiles/rails_4.2.gemfile
88

9-
- name: "Rails 5.0.2 on Ruby 2.4.5"
10-
rvm: 2.4.5
9+
- name: "Rails 5.0.2 on Ruby 2.4.6"
10+
rvm: 2.4.6
1111
gemfile: gemfiles/rails_5.0.2.gemfile
12-
- name: "Rails 5.0.6 on Ruby 2.4.5"
13-
rvm: 2.4.5
12+
- name: "Rails 5.0.6 on Ruby 2.4.6"
13+
rvm: 2.4.6
1414
gemfile: gemfiles/rails_5.0.6.gemfile
15-
- name: "Rails 5.0.7 on Ruby 2.4.5"
16-
rvm: 2.4.5
15+
- name: "Rails 5.0.7 on Ruby 2.4.6"
16+
rvm: 2.4.6
1717
gemfile: gemfiles/rails_5.0.7.gemfile
18-
- name: "Rails 5.1.4 on Ruby 2.4.5"
19-
rvm: 2.4.5
18+
- name: "Rails 5.1.4 on Ruby 2.4.6"
19+
rvm: 2.4.6
2020
gemfile: gemfiles/rails_5.1.4.gemfile
21-
- name: "Rails 5.1.5 on Ruby 2.4.5"
22-
rvm: 2.4.5
21+
- name: "Rails 5.1.5 on Ruby 2.4.6"
22+
rvm: 2.4.6
2323
gemfile: gemfiles/rails_5.1.5.gemfile
24-
- name: "Rails 5.2 on Ruby 2.4.5"
25-
rvm: 2.4.5
24+
- name: "Rails 5.2 on Ruby 2.4.6"
25+
rvm: 2.4.6
2626
gemfile: gemfiles/rails_5.2.gemfile
2727

28-
- name: "Rails 5.0.2 on Ruby 2.5.3"
29-
rvm: 2.5.3
28+
- name: "Rails 5.0.2 on Ruby 2.5.5"
29+
rvm: 2.5.5
3030
gemfile: gemfiles/rails_5.0.2.gemfile
31-
- name: "Rails 5.0.6 on Ruby 2.5.3"
32-
rvm: 2.5.3
31+
- name: "Rails 5.0.6 on Ruby 2.5.5"
32+
rvm: 2.5.5
3333
gemfile: gemfiles/rails_5.0.6.gemfile
34-
- name: "Rails 5.0.7 on Ruby 2.5.3"
35-
rvm: 2.5.3
34+
- name: "Rails 5.0.7 on Ruby 2.5.5"
35+
rvm: 2.5.5
3636
gemfile: gemfiles/rails_5.0.7.gemfile
37-
- name: "Rails 5.1.4 on Ruby 2.5.3"
38-
rvm: 2.5.3
37+
- name: "Rails 5.1.4 on Ruby 2.5.5"
38+
rvm: 2.5.5
3939
gemfile: gemfiles/rails_5.1.4.gemfile
40-
- name: "Rails 5.1.5 on Ruby 2.5.3"
41-
rvm: 2.5.3
40+
- name: "Rails 5.1.5 on Ruby 2.5.5"
41+
rvm: 2.5.5
4242
gemfile: gemfiles/rails_5.1.5.gemfile
43-
- name: "Rails 5.2 on Ruby 2.5.3"
44-
rvm: 2.5.3
43+
- name: "Rails 5.2 on Ruby 2.5.5"
44+
rvm: 2.5.5
4545
gemfile: gemfiles/rails_5.2.gemfile
4646

47-
- name: "Rails 5.2 on Ruby 2.6.2"
48-
rvm: 2.6.2
47+
- name: "Rails 5.2 on Ruby 2.6.3"
48+
rvm: 2.6.3
4949
gemfile: gemfiles/rails_5.2.gemfile
50-
- name: "Rails 6.0 on Ruby 2.6.2"
51-
rvm: 2.6.2
50+
- name: "Rails 6.0 on Ruby 2.6.3"
51+
rvm: 2.6.3
5252
gemfile: gemfiles/rails_6.0.gemfile
5353

5454
- name: "Rails 4.2 on JRuby 9.1.17.0"
5555
rvm: jruby-9.1.17.0
5656
gemfile: gemfiles/rails_4.2.gemfile
57-
- name: "Rails 5.1.5 on JRuby 9.2.6.0"
58-
rvm: jruby-9.2.6.0
57+
- name: "Rails 5.1.5 on JRuby 9.2.7.0"
58+
rvm: jruby-9.2.7.0
5959
gemfile: gemfiles/rails_5.1.5.gemfile
60-
- name: "Rails 5.2 on JRuby 9.2.6.0"
61-
rvm: jruby-9.2.6.0
60+
- name: "Rails 5.2 on JRuby 9.2.7.0"
61+
rvm: jruby-9.2.7.0
6262
gemfile: gemfiles/rails_5.2.gemfile
6363

6464
allow_failures:
6565
- rvm: jruby-9.1.17.0
66-
- rvm: jruby-9.2.6.0
66+
- rvm: jruby-9.2.7.0
6767

6868
jdk:
6969
- openjdk10

Appraisals

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
11
appraise 'rails_4.2' do
22
gem 'rails', '~> 4.2.0'
33
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.0', platform: :jruby
4+
gem 'sqlite3', '~> 1.3.0', platform: :ruby
45
end
56

67
appraise 'rails_5.0.2' do
78
gem 'minitest', '5.10.1'
89
gem 'rails', '5.0.2'
10+
gem 'sqlite3', '~> 1.3.0', platform: :ruby
911
end
1012

1113
appraise 'rails_5.0.6' do
1214
gem 'rails', '5.0.6'
15+
gem 'sqlite3', '~> 1.3.0', platform: :ruby
1316
end
1417

1518
appraise 'rails_5.0.7' do
1619
gem 'rails', '~> 5.0.7'
20+
gem 'sqlite3', '~> 1.3.0', platform: :ruby
1721
end
1822

1923
appraise 'rails_5.1.4' do
2024
gem 'rails', '5.1.4'
25+
gem 'sqlite3', '~> 1.3.0', platform: :ruby
2126
end
2227

2328
appraise 'rails_5.1.5' do
2429
gem 'rails', '~> 5.1.5'
30+
gem 'sqlite3', '~> 1.3.0', platform: :ruby
2531
end
2632

2733
appraise 'rails_5.2' do
2834
gem 'rails', '~> 5.2.0'
35+
gem 'sqlite3', '~> 1.3.0', platform: :ruby
2936
end
3037

3138
appraise 'rails_6.0' do
32-
gem 'rails', '6.0.0.beta1'
39+
gem 'rails', '6.0.0.rc1'
3340
end

Gemfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
1111
gem 'appraisal'
1212
gem 'jdbc-sqlite3', platform: :jruby
1313
gem 'puma'
14-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
14+
gem 'sqlite3', platform: :ruby
1515

16-
# gem 'rails', '~> 5.2.0'
17-
gem 'rails', '6.0.0.beta1'
18-
gem 'tzinfo-data'
16+
gem 'rails', '6.0.0.rc1'

gemfiles/rails_6.0.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1010
gem "appraisal"
1111
gem "jdbc-sqlite3", platform: :jruby
1212
gem "puma"
13-
gem "sqlite3", "~> 1.3.0", platform: :ruby
14-
gem "rails", "6.0.0.beta1"
13+
gem "sqlite3", platform: :ruby
14+
gem "rails", "6.0.0.rc1"
1515

1616
gemspec path: "../"

0 commit comments

Comments
 (0)