Skip to content

Commit 43dacb2

Browse files
authored
Merge pull request #141 from rails/update-build-matrix
Lock sqlite3 to ~> 1.3.6 on Rails <= 2.5.2, and update Travis build matrix
2 parents bd7174c + 562538a commit 43dacb2

File tree

7 files changed

+22
-11
lines changed

7 files changed

+22
-11
lines changed

.travis.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ rvm:
66
- 1.9.3
77
- 2.0.0
88
- 2.1.10
9-
- 2.2.9
10-
- 2.3.6
11-
- 2.4.3
12-
- 2.5.0
9+
- 2.2.10
10+
- 2.3.8
11+
- 2.4.5
12+
- 2.5.3
13+
- 2.6.1
1314
- ruby-head
1415
gemfile:
1516
- gemfiles/rails_4.0.gemfile
@@ -22,15 +23,19 @@ gemfile:
2223
matrix:
2324
fast_finish: true
2425
exclude:
25-
- rvm: 2.4.3
26+
- rvm: 2.4.5
2627
gemfile: gemfiles/rails_4.0.gemfile
27-
- rvm: 2.5.0
28+
- rvm: 2.5.3
29+
gemfile: gemfiles/rails_4.0.gemfile
30+
- rvm: 2.6.1
2831
gemfile: gemfiles/rails_4.0.gemfile
2932
- rvm: ruby-head
3033
gemfile: gemfiles/rails_4.0.gemfile
31-
- rvm: 2.4.3
34+
- rvm: 2.4.5
35+
gemfile: gemfiles/rails_4.1.gemfile
36+
- rvm: 2.5.3
3237
gemfile: gemfiles/rails_4.1.gemfile
33-
- rvm: 2.5.0
38+
- rvm: 2.6.1
3439
gemfile: gemfiles/rails_4.1.gemfile
3540
- rvm: ruby-head
3641
gemfile: gemfiles/rails_4.1.gemfile
@@ -58,9 +63,11 @@ matrix:
5863
gemfile: gemfiles/rails_edge.gemfile
5964
- rvm: 2.1.10
6065
gemfile: gemfiles/rails_edge.gemfile
61-
- rvm: 2.2.9
66+
- rvm: 2.2.10
67+
gemfile: gemfiles/rails_edge.gemfile
68+
- rvm: 2.3.8
6269
gemfile: gemfiles/rails_edge.gemfile
63-
- rvm: 2.3.6
70+
- rvm: 2.4.5
6471
gemfile: gemfiles/rails_edge.gemfile
6572
allow_failures:
6673
- rvm: ruby-head

activerecord-session_store.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@ Gem::Specification.new do |s|
2626
s.add_dependency('multi_json', '~> 1.11', '>= 1.11.2')
2727

2828
s.add_development_dependency('sqlite3')
29-
s.add_development_dependency('appraisal', '~> 2.1.0')
3029
end

gemfiles/rails_4.0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ gem "actionpack", "~> 4.0.0"
55
gem "activerecord", "~> 4.0.0"
66
gem "railties", "~> 4.0.0"
77
gem 'nokogiri', "~> #{nokogiri_ver}.0"
8+
gem "sqlite3", "~> 1.3.6"
89

910
gemspec :path => "../"

gemfiles/rails_4.1.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ gem "actionpack", "~> 4.1.0"
55
gem "activerecord", "~> 4.1.0"
66
gem "railties", "~> 4.1.0"
77
gem 'nokogiri', "~> #{nokogiri_ver}.0"
8+
gem "sqlite3", "~> 1.3.6"
89

910
gemspec :path => "../"

gemfiles/rails_4.2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ gem "actionpack", "~> 4.2.0"
55
gem "activerecord", "~> 4.2.0"
66
gem "railties", "~> 4.2.0"
77
gem 'nokogiri', "~> #{nokogiri_ver}.0"
8+
gem "sqlite3", "~> 1.3.6"
89

910
gemspec :path => "../"

gemfiles/rails_5.0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source "https://rubygems.org"
33
gem "actionpack", "~> 5.0.0"
44
gem "activerecord", "~> 5.0.0"
55
gem "railties", "~> 5.0.0"
6+
gem "sqlite3", "~> 1.3.6"
67

78
gemspec :path => "../"

gemfiles/rails_5.1.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source "https://rubygems.org"
33
gem "actionpack", "~> 5.1.0"
44
gem "activerecord", "~> 5.1.0"
55
gem "railties", "~> 5.1.0"
6+
gem "sqlite3", "~> 1.3.6"
67

78
gemspec :path => "../"

0 commit comments

Comments
 (0)