From db2b25a9529bf50662864430fdbc0b441596aa91 Mon Sep 17 00:00:00 2001 From: Alessandro Rodi Date: Tue, 22 Mar 2022 14:10:43 +0100 Subject: [PATCH] Drop ActiveRecord4 from CI --- .github/workflows/test.yml | 8 +---- Appraisals | 55 ++++++++++++++--------------- gemfiles/activerecord_4.2.0.gemfile | 21 ----------- gemfiles/activerecord_5.0.2.gemfile | 4 +-- gemfiles/activerecord_5.1.0.gemfile | 4 +-- gemfiles/activerecord_5.2.2.gemfile | 4 +-- gemfiles/activerecord_6.0.0.gemfile | 4 +-- gemfiles/activerecord_6.1.0.gemfile | 2 +- gemfiles/activerecord_7.0.0.gemfile | 2 +- gemfiles/activerecord_main.gemfile | 2 +- 10 files changed, 39 insertions(+), 67 deletions(-) delete mode 100644 gemfiles/activerecord_4.2.0.gemfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 200b7116e..08d0a5afe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: ruby: ['2.6', '2.7', '3.0', 'jruby', 'truffleruby'] - gemfile: ['gemfiles/activerecord_4.2.0.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'] + 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'] include: - gemfile: 'gemfiles/activerecord_7.0.0.gemfile' ruby: '3.1' @@ -34,12 +34,6 @@ jobs: 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_4.2.0.gemfile' - ruby: '3.0' # rails 4.2 can't run on ruby 3.0 - - gemfile: 'gemfiles/activerecord_4.2.0.gemfile' - ruby: '2.7' # rails 4.2 can't run on ruby 2.7 due to BigDecimal API change - - gemfile: 'gemfiles/activerecord_4.2.0.gemfile' - ruby: 'truffleruby' # TruffleRuby 21.0 targets Ruby 2.7, same as above - 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' diff --git a/Appraisals b/Appraisals index af06018ba..341b5d1cd 100644 --- a/Appraisals +++ b/Appraisals @@ -1,21 +1,3 @@ -appraise 'activerecord_4.2.0' do - gem 'activerecord', '~> 4.2.0', require: 'active_record' - gem 'activesupport', '~> 4.2.0', require: 'active_support/all' - gem 'actionpack', '~> 4.2.0', require: 'action_pack' - gem 'nokogiri', '~> 1.6.8', require: 'nokogiri' # TODO: fix for ruby 2.0.0 - - gemfile.platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.24' - gem 'jdbc-sqlite3' - gem 'jdbc-postgres' - end - - gemfile.platforms :ruby, :mswin, :mingw do - gem 'sqlite3', '~> 1.3.0' - gem 'pg', '~> 0.21' - end -end - appraise 'activerecord_5.0.2' do gem 'activerecord', '~> 5.0.2', require: 'active_record' gem 'activesupport', '~> 5.0.2', require: 'active_support/all' @@ -28,8 +10,8 @@ appraise 'activerecord_5.0.2' do end gemfile.platforms :ruby, :mswin, :mingw do - gem 'sqlite3', '~> 1.3.0' - gem 'pg', '~> 0.21' + gem 'pg', '~> 1.3.4' + gem 'sqlite3', '~> 1.4.2' end end @@ -45,8 +27,8 @@ appraise 'activerecord_5.1.0' do end gemfile.platforms :ruby, :mswin, :mingw do - gem 'sqlite3', '~> 1.3.0' - gem 'pg', '~> 0.21' + gem 'pg', '~> 1.3.4' + gem 'sqlite3', '~> 1.4.2' end end @@ -62,8 +44,8 @@ appraise 'activerecord_5.2.2' do end gemfile.platforms :ruby, :mswin, :mingw do - gem 'sqlite3', '~> 1.3.0' - gem 'pg', '~> 0.21' + gem 'pg', '~> 1.3.4' + gem 'sqlite3', '~> 1.4.2' end end @@ -79,8 +61,8 @@ appraise 'activerecord_6.0.0' do end platforms :ruby, :mswin, :mingw do - gem 'pg', '~> 1.1.4' - gem 'sqlite3', '~> 1.4.0' + gem 'pg', '~> 1.3.4' + gem 'sqlite3', '~> 1.4.2' end end @@ -96,7 +78,24 @@ appraise 'activerecord_6.1.0' do end platforms :ruby, :mswin, :mingw do - gem 'pg', '~> 1.2.3' + gem 'pg', '~> 1.3.4' + gem 'sqlite3', '~> 1.4.2' + end +end + +appraise 'activerecord_7.0.0' do + gem 'actionpack', '~> 7.0.0', require: 'action_pack' + gem 'activerecord', '~> 7.0.0', require: 'active_record' + gem 'activesupport', '~> 7.0.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.3.4' gem 'sqlite3', '~> 1.4.2' end end @@ -115,7 +114,7 @@ appraise 'activerecord_main' do end platforms :ruby, :mswin, :mingw do - gem 'pg', '~> 1.2.3' + gem 'pg', '~> 1.3.4' gem 'sqlite3', '~> 1.4.2' end end diff --git a/gemfiles/activerecord_4.2.0.gemfile b/gemfiles/activerecord_4.2.0.gemfile deleted file mode 100644 index f564b76c1..000000000 --- a/gemfiles/activerecord_4.2.0.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activerecord", "~> 4.2.0", require: "active_record" -gem "activesupport", "~> 4.2.0", require: "active_support/all" -gem "actionpack", "~> 4.2.0", require: "action_pack" -gem "nokogiri", "~> 1.6.8", require: "nokogiri" - -platforms :jruby do - gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24" - gem "jdbc-sqlite3" - gem "jdbc-postgres" -end - -platforms :ruby, :mswin, :mingw do - gem "sqlite3", "~> 1.3.0" - gem "pg", "~> 0.21" -end - -gemspec path: "../" diff --git a/gemfiles/activerecord_5.0.2.gemfile b/gemfiles/activerecord_5.0.2.gemfile index bec9ffcf3..3626aa8bc 100644 --- a/gemfiles/activerecord_5.0.2.gemfile +++ b/gemfiles/activerecord_5.0.2.gemfile @@ -13,8 +13,8 @@ platforms :jruby do end platforms :ruby, :mswin, :mingw do - gem "sqlite3", "~> 1.3.0" - gem "pg", "~> 0.21" + gem "pg", "~> 1.3.4" + gem "sqlite3", "~> 1.4.2" end gemspec path: "../" diff --git a/gemfiles/activerecord_5.1.0.gemfile b/gemfiles/activerecord_5.1.0.gemfile index ff8f083b9..fe5514f1a 100644 --- a/gemfiles/activerecord_5.1.0.gemfile +++ b/gemfiles/activerecord_5.1.0.gemfile @@ -13,8 +13,8 @@ platforms :jruby do end platforms :ruby, :mswin, :mingw do - gem "sqlite3", "~> 1.3.0" - gem "pg", "~> 0.21" + 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 1389b1b70..63ce61b4e 100644 --- a/gemfiles/activerecord_5.2.2.gemfile +++ b/gemfiles/activerecord_5.2.2.gemfile @@ -13,8 +13,8 @@ platforms :jruby do end platforms :ruby, :mswin, :mingw do - gem "sqlite3", "~> 1.3.0" - gem "pg", "~> 0.21" + gem "pg", "~> 1.3.4" + gem "sqlite3", "~> 1.4.2" end gemspec path: "../" diff --git a/gemfiles/activerecord_6.0.0.gemfile b/gemfiles/activerecord_6.0.0.gemfile index ad0c46c1a..e9f11ddd0 100644 --- a/gemfiles/activerecord_6.0.0.gemfile +++ b/gemfiles/activerecord_6.0.0.gemfile @@ -13,8 +13,8 @@ platforms :jruby do end platforms :ruby, :mswin, :mingw do - gem "pg", "~> 1.1.4" - gem "sqlite3", "~> 1.4.0" + gem "pg", "~> 1.3.4" + gem "sqlite3", "~> 1.4.2" end gemspec path: "../" diff --git a/gemfiles/activerecord_6.1.0.gemfile b/gemfiles/activerecord_6.1.0.gemfile index 857cfa4e2..88580ffa1 100644 --- a/gemfiles/activerecord_6.1.0.gemfile +++ b/gemfiles/activerecord_6.1.0.gemfile @@ -13,7 +13,7 @@ platforms :jruby do end platforms :ruby, :mswin, :mingw do - gem "pg", "~> 1.2.3" + gem "pg", "~> 1.3.4" gem "sqlite3", "~> 1.4.2" end diff --git a/gemfiles/activerecord_7.0.0.gemfile b/gemfiles/activerecord_7.0.0.gemfile index c930c7cdc..1f0c169dd 100644 --- a/gemfiles/activerecord_7.0.0.gemfile +++ b/gemfiles/activerecord_7.0.0.gemfile @@ -13,7 +13,7 @@ platforms :jruby do end platforms :ruby, :mswin, :mingw do - gem "pg", "~> 1.2.3" + gem "pg", "~> 1.3.4" gem "sqlite3", "~> 1.4.2" end diff --git a/gemfiles/activerecord_main.gemfile b/gemfiles/activerecord_main.gemfile index 46f55df29..ba43821e8 100644 --- a/gemfiles/activerecord_main.gemfile +++ b/gemfiles/activerecord_main.gemfile @@ -15,7 +15,7 @@ platforms :jruby do end platforms :ruby, :mswin, :mingw do - gem "pg", "~> 1.2.3" + gem "pg", "~> 1.3.4" gem "sqlite3", "~> 1.4.2" end