Skip to content

Commit

Permalink
This is the commit message #3:
Browse files Browse the repository at this point in the history
Do not run rails >= 7 on ruby < 3
  • Loading branch information
coorasse committed May 23, 2024
1 parent 2f4c3cf commit c00f7d0
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 90 deletions.
32 changes: 13 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,30 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.6', '2.7', '3.0', 'jruby', 'truffleruby']
gemfile: ['gemfiles/activerecord_5.0.2.gemfile', 'gemfiles/activerecord_5.1.0.gemfile', 'gemfiles/activerecord_5.2.2.gemfile', 'gemfiles/activerecord_6.0.0.gemfile', 'gemfiles/activerecord_6.1.0.gemfile', 'gemfiles/activerecord_main.gemfile']
ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', 'jruby', 'truffleruby']
gemfile: ['gemfiles/activerecord_5.2.2.gemfile', 'gemfiles/activerecord_6.0.0.gemfile', 'gemfiles/activerecord_6.1.0.gemfile', 'gemfiles/activerecord_7.0.0.gemfile', 'gemfiles/activerecord_7.1.0.gemfile', 'gemfiles/activerecord_main.gemfile']
include:
- gemfile: 'gemfiles/activerecord_7.1.0.gemfile'
ruby: '3.3'
- gemfile: 'gemfiles/activerecord_7.1.0.gemfile'
ruby: '3.0'
- gemfile: 'gemfiles/activerecord_7.0.0.gemfile'
ruby: '3.1'
ruby: '3.3'
- gemfile: 'gemfiles/activerecord_7.0.0.gemfile'
ruby: '3.0'
- gemfile: 'gemfiles/activerecord_6.1.0.gemfile'
ruby: '3.1'
ruby: '3.3'
- gemfile: 'gemfiles/activerecord_6.1.0.gemfile'
ruby: '3.0'
exclude:
- gemfile: 'gemfiles/activerecord_5.2.2.gemfile'
ruby: '3.0' # rails 5.2 can't run on ruby 3.0
- gemfile: 'gemfiles/activerecord_5.1.0.gemfile'
ruby: '3.0' # rails 5.1 can't run on ruby 3.0
- gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
ruby: '3.0' # rails 5.0 can't run on ruby 3.0
- gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
ruby: '3.0' # rails 5.0 can't run on ruby 3.0
- gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
ruby: 'truffleruby' # TruffleRuby 21.0 targets Ruby 2.7, same as above
- gemfile: 'gemfiles/activerecord_5.1.0.gemfile'
ruby: 'truffleruby' # TruffleRuby 21.0 targets Ruby 2.7, same as above
- gemfile: 'gemfiles/activerecord_5.2.2.gemfile'
ruby: 'truffleruby' # TruffleRuby 21.0 targets Ruby 2.7, same as above
- gemfile: 'gemfiles/activerecord_7.0.0.gemfile'
ruby: '2.7'
- gemfile: 'gemfiles/activerecord_7.1.0.gemfile'
ruby: '2.7'
- gemfile: 'gemfiles/activerecord_main.gemfile'
ruby: '2.6' # rails 7+ requires ruby 3.0+
- gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
ruby: 'jruby' # this *should* work - there's a test failure; it's not incompatible like the other excludes. could be an issue in Rails 5.0.2?
ruby: '2.7'
- gemfile: 'gemfiles/activerecord_6.1.0.gemfile'
ruby: 'jruby' # this *should* work. it seems like there's an issue with rails 6 on jruby.
- gemfile: 'gemfiles/activerecord_main.gemfile'
Expand Down
63 changes: 23 additions & 40 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,37 +1,3 @@
appraise 'activerecord_5.0.2' do
gem 'activerecord', '~> 5.0.2', require: 'active_record'
gem 'activesupport', '~> 5.0.2', require: 'active_support/all'
gem 'actionpack', '~> 5.0.2', require: 'action_pack'

gemfile.platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
gem 'jdbc-sqlite3'
gem 'jdbc-postgres'
end

gemfile.platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.3.4'
gem 'sqlite3', '~> 1.3.0'
end
end

appraise 'activerecord_5.1.0' do
gem 'activerecord', '~> 5.1.0', require: 'active_record'
gem 'activesupport', '~> 5.1.0', require: 'active_support/all'
gem 'actionpack', '~> 5.1.0', require: 'action_pack'

gemfile.platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
gem 'jdbc-sqlite3'
gem 'jdbc-postgres'
end

gemfile.platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.3.4'
gem 'sqlite3', '~> 1.4.2'
end
end

appraise 'activerecord_5.2.2' do
gem 'activerecord', '~> 5.2.2', require: 'active_record'
gem 'activesupport', '~> 5.2.2', require: 'active_support/all'
Expand All @@ -45,7 +11,7 @@ appraise 'activerecord_5.2.2' do

gemfile.platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.3.4'
gem 'sqlite3', '~> 1.4.2'
gem 'sqlite3', '~> 1.7.3'
end
end

Expand All @@ -62,7 +28,7 @@ appraise 'activerecord_6.0.0' do

platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.3.4'
gem 'sqlite3', '~> 1.4.2'
gem 'sqlite3', '~> 1.7.3'
end
end

Expand All @@ -79,7 +45,7 @@ appraise 'activerecord_6.1.0' do

platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.3.4'
gem 'sqlite3', '~> 1.4.2'
gem 'sqlite3', '~> 1.7.3'
end
end

Expand All @@ -96,7 +62,24 @@ appraise 'activerecord_7.0.0' do

platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.3.4'
gem 'sqlite3', '~> 1.4.2'
gem 'sqlite3', '~> 1.7.3'
end
end

appraise 'activerecord_7.1.0' do
gem 'actionpack', '~> 7.1.0', require: 'action_pack'
gem 'activerecord', '~> 7.1.0', require: 'active_record'
gem 'activesupport', '~> 7.1.0', require: 'active_support/all'

platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
gem 'jdbc-sqlite3'
gem 'jdbc-postgres'
end

platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.5.6'
gem 'sqlite3', '~> 1.7.3'
end
end

Expand All @@ -114,7 +97,7 @@ appraise 'activerecord_main' do
end

platforms :ruby, :mswin, :mingw do
gem 'pg', '~> 1.3.4'
gem 'sqlite3', '~> 1.4.2'
gem 'pg', '~> 1.5.6'
gem 'sqlite3', '~> 1.7.3'
end
end
20 changes: 0 additions & 20 deletions gemfiles/activerecord_5.1.0.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/activerecord_5.2.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.3.4"
gem "sqlite3", "~> 1.4.2"
gem "sqlite3", "~> 1.7.3"
end

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/activerecord_6.0.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.3.4"
gem "sqlite3", "~> 1.4.2"
gem "sqlite3", "~> 1.7.3"
end

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/activerecord_6.1.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.3.4"
gem "sqlite3", "~> 1.4.2"
gem "sqlite3", "~> 1.7.3"
end

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/activerecord_7.0.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.3.4"
gem "sqlite3", "~> 1.4.2"
gem "sqlite3", "~> 1.7.3"
end

gemspec path: "../"
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

source "https://rubygems.org"

gem "activerecord", "~> 5.0.2", require: "active_record"
gem "activesupport", "~> 5.0.2", require: "active_support/all"
gem "actionpack", "~> 5.0.2", require: "action_pack"
gem "actionpack", "~> 7.1.0", require: "action_pack"
gem "activerecord", "~> 7.1.0", require: "active_record"
gem "activesupport", "~> 7.1.0", require: "active_support/all"

platforms :jruby do
gem "activerecord-jdbcsqlite3-adapter"
Expand All @@ -13,8 +13,8 @@ platforms :jruby do
end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.3.4"
gem "sqlite3", "~> 1.3.0"
gem "pg", "~> 1.5.6"
gem "sqlite3", "~> 1.7.3"
end

gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/activerecord_main.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ platforms :jruby do
end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.3.4"
gem "sqlite3", "~> 1.4.2"
gem "pg", "~> 1.5.6"
gem "sqlite3", "~> 1.7.3"
end

gemspec path: "../"

0 comments on commit c00f7d0

Please sign in to comment.