Skip to content

Commit 14904d4

Browse files
authored
Merge pull request #5747 from solidusio/backport/v4.3/pr-5727
[v4.3] Restrict sqlite3 gem to '~> 1.3', like ActiveRecord
2 parents 5dbd82c + ab0cdf8 commit 14904d4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.circleci/config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ commands:
230230
cd /tmp/dummy_extension
231231
bundle init
232232
bundle add rails -v "< 7.1" --skip-install
233-
bundle add sqlite3 <<parameters.extra_gems>> --skip-install
233+
bundle add sqlite3 -v "~> 1.3" --skip-install
234+
test -n "<<parameters.extra_gems>>" && bundle add <<parameters.extra_gems>> --skip-install
234235
bundle add solidus --path "$(ruby -e"puts File.expand_path ENV['CIRCLE_WORKING_DIRECTORY']")"
235236
export LIB_NAME=set # dummy requireable file
236237
bundle exec rake -rrails -rspree/testing_support/extension_rake -e'Rake::Task["extension:test_app"].invoke'

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dbs = ENV['DB_ALL'] ? 'all' : ENV.fetch('DB', 'sqlite')
2424
gem 'mysql2', '~> 0.5.0', require: false if dbs.match?(/all|mysql/)
2525
gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/)
2626
gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/)
27+
gem 'sqlite3', '~> 1.4', require: false if dbs.match?(/all|sqlite/)
2728

2829
gem 'database_cleaner', '~> 2.0', require: false
2930
gem 'rspec-activemodel-mocks', '~> 1.1', require: false

0 commit comments

Comments
 (0)