Skip to content

Commit 8bdd864

Browse files
authored
Merge pull request solidusio#149 from aitbw/aitbw/extension_maintenance
Extension maintenance
2 parents 5fb1afe + 379eb85 commit 8bdd864

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ rvm:
99
- 2.5
1010
env:
1111
matrix:
12-
- SOLIDUS_BRANCH=v2.3 DB=postgres
1312
- SOLIDUS_BRANCH=v2.4 DB=postgres
1413
- SOLIDUS_BRANCH=v2.5 DB=postgres
1514
- SOLIDUS_BRANCH=v2.6 DB=postgres
1615
- SOLIDUS_BRANCH=v2.7 DB=postgres
16+
- SOLIDUS_BRANCH=v2.8 DB=postgres
1717
- SOLIDUS_BRANCH=master DB=postgres
18-
- SOLIDUS_BRANCH=v2.3 DB=mysql
1918
- SOLIDUS_BRANCH=v2.4 DB=mysql
2019
- SOLIDUS_BRANCH=v2.5 DB=mysql
2120
- SOLIDUS_BRANCH=v2.6 DB=mysql
2221
- SOLIDUS_BRANCH=v2.7 DB=mysql
22+
- SOLIDUS_BRANCH=v2.8 DB=mysql
2323
- SOLIDUS_BRANCH=master DB=mysql

Gemfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@ source "https://rubygems.org"
33
branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
44
gem "solidus", github: "solidusio/solidus", branch: branch
55

6-
if branch == 'master' || branch >= "v2.0"
7-
gem "rails-controller-testing", group: :test
6+
if ENV['DB'] == 'mysql'
7+
gem 'mysql2', '~> 0.4.10'
88
else
9-
gem "rails_test_params_backport", group: :test
9+
gem 'pg', '~> 0.21'
1010
end
1111

12-
gem 'pg', '~> 0.21'
13-
gem 'sqlite3'
14-
gem 'mysql2', '~> 0.4.10'
15-
1612
group :development, :test do
1713
gem "pry-rails"
1814
gem 'i18n-tasks', '~> 0.9' if branch == 'master'

solidus_i18n.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
2727
s.add_development_dependency 'rubocop', '>= 0.24.1'
2828
s.add_development_dependency 'rspec-rails', '~> 3.1'
2929
s.add_development_dependency 'simplecov', '~> 0.9'
30+
s.add_development_dependency 'sqlite3', '~> 1.3.6'
3031
end

0 commit comments

Comments
 (0)