Skip to content

Commit 89e6711

Browse files
author
Igor
committed
CI fixes
1 parent 3d40929 commit 89e6711

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

Gemfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ gemspec
1212

1313
# To use a debugger
1414
gem 'byebug', group: [:development, :test]
15-
gem 'sqlite3', '~> 1.3', '<= 1.4.2', group: [:development, :test]
15+
# Rails 8+ requires sqlite3 >= 2.1; older Rails use 1.4.x for Ruby 2.7 compatibility
16+
if ENV['RAILS_VERSION']&.start_with?('8.')
17+
gem 'sqlite3', '>= 2.1', group: [:development, :test]
18+
else
19+
gem 'sqlite3', '~> 1.3', '<= 1.4.2', group: [:development, :test]
20+
end
1621
gem 'sass-rails', '~> 5.0.7', group: [:development, :test]

imageboss-rails.gemspec

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,14 @@ Gem::Specification.new do |s|
3333
end
3434

3535
s.add_dependency 'rails', rails
36+
37+
# Rails 5.2 and 6.1 LineFiltering#run expects 2 args; Minitest 6 changed to 3. Pin to 5.x.
38+
if rails_version != "default" && (rails_version.start_with?("5.") || rails_version.start_with?("6.1"))
39+
s.add_development_dependency "minitest", "~> 5.14"
40+
end
41+
42+
# Silence "will no longer be part of the default gems starting from Ruby 3.4.0" warnings in CI.
43+
s.add_development_dependency "bigdecimal"
44+
s.add_development_dependency "mutex_m"
45+
s.add_development_dependency "drb"
3646
end

test/dummy/config/application.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ class Application < Rails::Application
1717
config.imageboss.source = 'mywebsite-assets'
1818
config.imageboss.asset_host = 'https://mywebsite.com'
1919

20+
# Rails 8.1+: opt in to to_time preserving timezone (silences deprecation)
21+
if config.respond_to?(:active_support) && config.active_support.respond_to?(:to_time_preserves_timezone=)
22+
config.active_support.to_time_preserves_timezone = :zone
23+
end
24+
2025
# Silence SQLite boolean serialization deprecation (Rails 5.2+)
2126
if config.active_record.respond_to?(:sqlite3)
2227
config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3.respond_to?(:represent_boolean_as_integer=)

0 commit comments

Comments
 (0)