Skip to content

Commit

Permalink
Merge pull request #3325 from nebulab/kennyadsl/sandbox-sqlite-rails6
Browse files Browse the repository at this point in the history
Remove sqlite3 version lock in sandbox/development
  • Loading branch information
kennyadsl authored Sep 9, 2019
2 parents 0c9670e + 7198433 commit 1a337ed
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ group :backend, :frontend, :core, :api do
when /postgres/
gem 'pg', '~> 1.0', require: false
else
gem 'sqlite3', '~> 1.3.6', require: false
gem 'sqlite3', require: false
gem 'fast_sqlite', require: false
end
end
Expand Down
4 changes: 0 additions & 4 deletions lib/sandbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ group :test, :development do
end
RUBY

# Ensure sqlite3 version to match ActiveRecord SQLite adapter requirement
# (see https://github.com/solidusio/solidus/issues/3087 for details)
sed -i -e "s/gem 'sqlite3'/gem 'sqlite3', '~> 1.3.6'/g" Gemfile

bundle install --gemfile Gemfile
bundle exec rake db:drop db:create
bundle exec rails g spree:install --auto-accept --user_class=Spree::User --enforce_available_locales=true
Expand Down

0 comments on commit 1a337ed

Please sign in to comment.