From c00f7d0f8b4fea4fd76e6eb2e89ee383a467d9ac Mon Sep 17 00:00:00 2001 From: Alessandro Rodi Date: Thu, 23 May 2024 12:36:32 +0200 Subject: [PATCH] This is the commit message #3: Do not run rails >= 7 on ruby < 3 --- .github/workflows/test.yml | 32 ++++------ Appraisals | 63 +++++++------------ gemfiles/activerecord_5.1.0.gemfile | 20 ------ gemfiles/activerecord_5.2.2.gemfile | 2 +- gemfiles/activerecord_6.0.0.gemfile | 2 +- gemfiles/activerecord_6.1.0.gemfile | 2 +- gemfiles/activerecord_7.0.0.gemfile | 2 +- ...0.2.gemfile => activerecord_7.1.0.gemfile} | 10 +-- gemfiles/activerecord_main.gemfile | 4 +- 9 files changed, 47 insertions(+), 90 deletions(-) delete mode 100644 gemfiles/activerecord_5.1.0.gemfile rename gemfiles/{activerecord_5.0.2.gemfile => activerecord_7.1.0.gemfile} (51%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 08d0a5af..89d65bff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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' diff --git a/Appraisals b/Appraisals index d025b2d2..2bb71a21 100644 --- a/Appraisals +++ b/Appraisals @@ -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' @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/gemfiles/activerecord_5.1.0.gemfile b/gemfiles/activerecord_5.1.0.gemfile deleted file mode 100644 index fe5514f1..00000000 --- a/gemfiles/activerecord_5.1.0.gemfile +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -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" - -platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter" - gem "jdbc-sqlite3" - gem "jdbc-postgres" -end - -platforms :ruby, :mswin, :mingw do - gem "pg", "~> 1.3.4" - gem "sqlite3", "~> 1.4.2" -end - -gemspec path: "../" diff --git a/gemfiles/activerecord_5.2.2.gemfile b/gemfiles/activerecord_5.2.2.gemfile index 63ce61b4..071167d7 100644 --- a/gemfiles/activerecord_5.2.2.gemfile +++ b/gemfiles/activerecord_5.2.2.gemfile @@ -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: "../" diff --git a/gemfiles/activerecord_6.0.0.gemfile b/gemfiles/activerecord_6.0.0.gemfile index e9f11ddd..a2777cd1 100644 --- a/gemfiles/activerecord_6.0.0.gemfile +++ b/gemfiles/activerecord_6.0.0.gemfile @@ -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: "../" diff --git a/gemfiles/activerecord_6.1.0.gemfile b/gemfiles/activerecord_6.1.0.gemfile index 88580ffa..fd081871 100644 --- a/gemfiles/activerecord_6.1.0.gemfile +++ b/gemfiles/activerecord_6.1.0.gemfile @@ -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: "../" diff --git a/gemfiles/activerecord_7.0.0.gemfile b/gemfiles/activerecord_7.0.0.gemfile index 1f0c169d..c0840521 100644 --- a/gemfiles/activerecord_7.0.0.gemfile +++ b/gemfiles/activerecord_7.0.0.gemfile @@ -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: "../" diff --git a/gemfiles/activerecord_5.0.2.gemfile b/gemfiles/activerecord_7.1.0.gemfile similarity index 51% rename from gemfiles/activerecord_5.0.2.gemfile rename to gemfiles/activerecord_7.1.0.gemfile index 8f0cb561..72952c7b 100644 --- a/gemfiles/activerecord_5.0.2.gemfile +++ b/gemfiles/activerecord_7.1.0.gemfile @@ -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" @@ -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: "../" diff --git a/gemfiles/activerecord_main.gemfile b/gemfiles/activerecord_main.gemfile index ba43821e..cbc6172c 100644 --- a/gemfiles/activerecord_main.gemfile +++ b/gemfiles/activerecord_main.gemfile @@ -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: "../"