Skip to content

Commit

Permalink
Update Ruby and Rails versions (#86)
Browse files Browse the repository at this point in the history
  • Loading branch information
santib authored Jul 5, 2024
1 parent 23383fd commit 4c9ea35
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 5 deletions.
24 changes: 22 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
gemfile: [rails_5_2.gemfile, rails_6_0.gemfile, rails_6_1.gemfile, rails_7_0.gemfile, rails_7_1.gemfile, rails_main.gemfile]
ruby_version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
gemfile: [rails_5_2.gemfile, rails_6_0.gemfile, rails_6_1.gemfile, rails_7_0.gemfile, rails_7_1.gemfile, rails_7_2.gemfile, rails_main.gemfile]
ruby_version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
exclude:
- gemfile: rails_main.gemfile
ruby_version: '2.3'
Expand All @@ -21,6 +21,20 @@ jobs:
ruby_version: '2.6'
- gemfile: rails_main.gemfile
ruby_version: '2.7'
- gemfile: rails_main.gemfile
ruby_version: '3.0'
- gemfile: rails_7_2.gemfile
ruby_version: '2.3'
- gemfile: rails_7_2.gemfile
ruby_version: '2.4'
- gemfile: rails_7_2.gemfile
ruby_version: '2.5'
- gemfile: rails_7_2.gemfile
ruby_version: '2.6'
- gemfile: rails_7_2.gemfile
ruby_version: '2.7'
- gemfile: rails_7_2.gemfile
ruby_version: '3.0'
- gemfile: rails_7_1.gemfile
ruby_version: '2.3'
- gemfile: rails_7_1.gemfile
Expand All @@ -45,6 +59,8 @@ jobs:
ruby_version: '3.1'
- gemfile: rails_6_1.gemfile
ruby_version: '3.2'
- gemfile: rails_6_1.gemfile
ruby_version: '3.3'
- gemfile: rails_6_0.gemfile
ruby_version: '2.3'
- gemfile: rails_6_0.gemfile
Expand All @@ -55,12 +71,16 @@ jobs:
ruby_version: '3.1'
- gemfile: rails_6_0.gemfile
ruby_version: '3.2'
- gemfile: rails_6_0.gemfile
ruby_version: '3.3'
- gemfile: rails_5_2.gemfile
ruby_version: '3.0'
- gemfile: rails_5_2.gemfile
ruby_version: '3.1'
- gemfile: rails_5_2.gemfile
ruby_version: '3.2'
- gemfile: rails_5_2.gemfile
ruby_version: '3.3'
env:
BUNDLE_GEMFILE: spec/gemfiles/${{ matrix.gemfile }}
steps:
Expand Down
1 change: 1 addition & 0 deletions spec/gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ source 'https://rubygems.org'
gemspec path: '../..'

gem 'rails', '~> 5.2.0'
gem 'sqlite3', '~> 1.4.4'
5 changes: 5 additions & 0 deletions spec/gemfiles/rails_7_2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'

gemspec path: '../..'

gem 'rails', '~> 7.2.0.beta2'
4 changes: 3 additions & 1 deletion spec/support/database_cleaner_monkeypatch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ module DatabaseCleaner
module ActiveRecord
class Base < DatabaseCleaner::Strategy
def self.migration_table_name
if Gem::Version.new('6.0.0') <= ::ActiveRecord.version
if ::ActiveRecord.version >= Gem::Version.new('7.2.0.beta2')
::ActiveRecord::Base.connection_pool.schema_migration.table_name
elsif ::ActiveRecord.version >= Gem::Version.new('6.0.0')
::ActiveRecord::Base.connection.schema_migration.table_name
else
::ActiveRecord::SchemaMigration.table_name
Expand Down
4 changes: 2 additions & 2 deletions yaaf.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
spec.add_dependency 'activemodel', '>= 5.2'
spec.add_dependency 'activerecord', '>= 5.2'

spec.add_development_dependency 'database_cleaner-active_record', '~> 2.0.1'
spec.add_development_dependency 'database_cleaner-active_record', '~> 2.1.0'
spec.add_development_dependency 'rake', '~> 13.0.1'
spec.add_development_dependency 'reek', '~> 5.6.0'
spec.add_development_dependency 'rspec', '~> 3.9.0'
spec.add_development_dependency 'rubocop', '~> 0.80.0'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'sqlite3', '~> 1.4.2'
spec.add_development_dependency 'sqlite3', '~> 1.5.0'
end

0 comments on commit 4c9ea35

Please sign in to comment.