From 6f258e6f111f8ba9e049d5fd7ea04c4ec2ee395e Mon Sep 17 00:00:00 2001 From: Rob Paskin Date: Fri, 17 Oct 2025 16:23:02 +0100 Subject: [PATCH 1/2] Loosen Rails gem version requirements One less thing to have to fix with Rails upgrades, and gem has not needed changes for the past few upgrades anyway. --- csv2db.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/csv2db.gemspec b/csv2db.gemspec index 087c5ce..20b73d7 100644 --- a/csv2db.gemspec +++ b/csv2db.gemspec @@ -33,11 +33,11 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_dependency 'activerecord', '>= 4.2', '< 7.1' - spec.add_dependency 'activesupport', '>= 4.2', '< 7.1' + spec.add_dependency 'activerecord', '>= 4.2' + spec.add_dependency 'activesupport', '>= 4.2' spec.add_dependency 'charlock_holmes', '~> 0.7.3' spec.add_dependency 'dragonfly', '~> 1' - spec.add_dependency 'railties', '>= 4.2', '< 7.1' + spec.add_dependency 'railties', '>= 4.2' spec.add_dependency 'sidekiq', '>= 3' spec.add_development_dependency 'bundler', '>= 2.2.18', '< 3' From e7041f1e167121926075cad9bc95b719665815eb Mon Sep 17 00:00:00 2001 From: Rob Paskin Date: Fri, 17 Oct 2025 16:42:30 +0100 Subject: [PATCH 2/2] Pin Rails gem and Bundler version used for dev/test --- Gemfile | 5 +++++ docker-entrypoint.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ebacb84..3be3835 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,8 @@ source 'https://rubygems.org' # Specify your gem's dependencies in csv2db.gemspec gemspec + +# Used for testing +gem 'activerecord', '~> 7.0.0' +gem 'activesupport', '~> 7.0.0' +gem 'railties', '~> 7.0.0' diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index a430d43..2748055 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,7 +20,7 @@ endgroup group "bundle install" -bundle install \ +bundle _2.4.22_ install \ --jobs "$(getconf _NPROCESSORS_ONLN)" \ --retry 2