Skip to content

Commit 2444fe2

Browse files
kbrockmanxingxing
authored andcommitted
Get Travis tests passing (ClosureTree#352)
* peg sqlite3 gems * drop ruby 2.2 and 2.3 * tell travis to run mysql and postgres sure, we're running both for both all 3 runs so not perfectly optimal, but greatly simplifies the implementation * reduce the build matrix no reason to run so many ruby versions * add tests for 6.0
1 parent dc91da1 commit 2444fe2

6 files changed

+52
-15
lines changed

.travis.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ cache: bundler
22
sudo: false
33
language: ruby
44
rvm:
5-
- 2.6.0
6-
- 2.5.1
7-
- 2.4.4
8-
- 2.3.6
9-
- 2.2.10
5+
- 2.6.3
6+
- 2.5.5
107

118
gemfile:
9+
- gemfiles/activerecord_6.0.gemfile
1210
- gemfiles/activerecord_5.2.gemfile
1311
- gemfiles/activerecord_5.1.gemfile
1412
- gemfiles/activerecord_5.0.gemfile
@@ -20,11 +18,16 @@ env:
2018
- DB=mysql
2119
- DB=postgresql
2220

21+
services:
22+
- mysql
23+
- postgresql
24+
2325
script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all
2426

2527
matrix:
2628
allow_failures:
27-
- gemfile: gemfiles/activerecord_edge.gemfile
28-
- rvm: jruby-head
29-
- rvm: rbx
30-
- rvm: 2.6.0
29+
- gemfile: gemfiles/activerecord_edge.gemfile
30+
- gemfile: gemfiles/activerecord_6.0.gemfile
31+
exclude:
32+
- rvm: 2.5.5
33+
gemfile: gemfiles/activerecord_edge.gemfile

Appraisals

+18-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ appraise 'activerecord-4.2' do
44
platforms :ruby do
55
gem 'mysql2', "< 0.5"
66
gem 'pg', "~> 0.21"
7-
gem 'sqlite3'
7+
gem 'sqlite3', '~> 1.3.13'
88
end
99

1010
platforms :jruby do
@@ -19,7 +19,7 @@ appraise 'activerecord-5.0' do
1919
platforms :ruby do
2020
gem 'mysql2'
2121
gem 'pg'
22-
gem 'sqlite3'
22+
gem 'sqlite3', '~> 1.3.13'
2323
end
2424

2525
platforms :jruby do
@@ -34,7 +34,7 @@ appraise 'activerecord-5.1' do
3434
platforms :ruby do
3535
gem 'mysql2'
3636
gem 'pg'
37-
gem 'sqlite3'
37+
gem 'sqlite3', '~> 1.3.13'
3838
end
3939

4040
platforms :jruby do
@@ -59,6 +59,21 @@ appraise 'activerecord-5.2' do
5959
end
6060
end
6161

62+
appraise 'activerecord-6.0' do
63+
gem 'activerecord', '~> 6.0.0'
64+
platforms :ruby do
65+
gem 'mysql2'
66+
gem 'pg'
67+
gem 'sqlite3'
68+
end
69+
70+
platforms :jruby do
71+
gem 'activerecord-jdbcmysql-adapter'
72+
gem 'activerecord-jdbcpostgresql-adapter'
73+
gem 'activerecord-jdbcsqlite3-adapter'
74+
end
75+
end
76+
6277
appraise 'activerecord-edge' do
6378
gem 'activerecord', github: 'rails/rails'
6479
platforms :ruby do

gemfiles/activerecord_4.2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem "activerecord", "~> 4.2.0"
77
platforms :ruby do
88
gem "mysql2", "< 0.5"
99
gem "pg", "~> 0.21"
10-
gem "sqlite3"
10+
gem "sqlite3", "~> 1.3.13"
1111
end
1212

1313
platforms :jruby do

gemfiles/activerecord_5.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem "activerecord", "~> 5.0.0"
77
platforms :ruby do
88
gem "mysql2"
99
gem "pg"
10-
gem "sqlite3"
10+
gem "sqlite3", "~> 1.3.13"
1111
end
1212

1313
platforms :jruby do

gemfiles/activerecord_5.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem "activerecord", "~> 5.1.0"
77
platforms :ruby do
88
gem "mysql2"
99
gem "pg"
10-
gem "sqlite3"
10+
gem "sqlite3", "~> 1.3.13"
1111
end
1212

1313
platforms :jruby do

gemfiles/activerecord_6.0.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 "activerecord", "~> 6.0.0"
6+
7+
platforms :ruby do
8+
gem "mysql2"
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)