From 1605496fd1deac3071ce3122f29824036bf0155b Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran <guilleiguaran@gmail.com> Date: Tue, 25 Apr 2023 20:05:36 -0700 Subject: [PATCH 1/2] Keep only the most recent EOL versions of Ruby and Rails --- .github/workflows/active_model_otp.yml | 29 ++------------------------ Appraisals | 17 --------------- gemfiles/rails_4.2.gemfile | 8 ------- gemfiles/rails_5.0.gemfile | 9 -------- gemfiles/rails_5.1.gemfile | 9 -------- 5 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 gemfiles/rails_4.2.gemfile delete mode 100644 gemfiles/rails_5.0.gemfile delete mode 100644 gemfiles/rails_5.1.gemfile diff --git a/.github/workflows/active_model_otp.yml b/.github/workflows/active_model_otp.yml index 8efa9da..ed1923f 100644 --- a/.github/workflows/active_model_otp.yml +++ b/.github/workflows/active_model_otp.yml @@ -12,44 +12,19 @@ jobs: strategy: matrix: - gemfile: [rails_4.2, rails_5.0, rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0] - ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2] + gemfile: [rails_5.2, rails_6.0, rails_6.1, rails_7.0] + ruby-version: [2.7, 3.0, 3.1, 3.2] exclude: - - { gemfile: rails_4.2, ruby-version: 2.5 } - - { gemfile: rails_4.2, ruby-version: 2.6 } - - { gemfile: rails_4.2, ruby-version: 2.7 } - - { gemfile: rails_4.2, ruby-version: 3.0 } - - { gemfile: rails_4.2, ruby-version: 3.1 } - - { gemfile: rails_4.2, ruby-version: 3.2 } - - { gemfile: rails_5.0, ruby-version: 2.5 } - - { gemfile: rails_5.0, ruby-version: 2.6 } - - { gemfile: rails_5.0, ruby-version: 2.7 } - - { gemfile: rails_5.0, ruby-version: 3.0 } - - { gemfile: rails_5.0, ruby-version: 3.1 } - - { gemfile: rails_5.0, ruby-version: 3.2 } - - { gemfile: rails_5.1, ruby-version: 2.6 } - - { gemfile: rails_5.1, ruby-version: 2.7 } - - { gemfile: rails_5.1, ruby-version: 3.0 } - - { gemfile: rails_5.1, ruby-version: 3.1 } - - { gemfile: rails_5.1, ruby-version: 3.2 } - { gemfile: rails_5.2, ruby-version: 2.7 } - { gemfile: rails_5.2, ruby-version: 3.0 } - { gemfile: rails_5.2, ruby-version: 3.1 } - { gemfile: rails_5.2, ruby-version: 3.2 } - - { gemfile: rails_6.0, ruby-version: 2.3 } - - { gemfile: rails_6.0, ruby-version: 2.4 } - { gemfile: rails_6.0, ruby-version: 3.0 } - { gemfile: rails_6.0, ruby-version: 3.1 } - { gemfile: rails_6.0, ruby-version: 3.2 } - - { gemfile: rails_6.1, ruby-version: 2.3 } - - { gemfile: rails_6.1, ruby-version: 2.4 } - { gemfile: rails_6.1, ruby-version: 3.0 } - { gemfile: rails_6.1, ruby-version: 3.1 } - { gemfile: rails_6.1, ruby-version: 3.2 } - - { gemfile: rails_7.0, ruby-version: 2.3 } - - { gemfile: rails_7.0, ruby-version: 2.4 } - - { gemfile: rails_7.0, ruby-version: 2.5 } - - { gemfile: rails_7.0, ruby-version: 2.6 } env: BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/Appraisals b/Appraisals index c160677..5b24d01 100644 --- a/Appraisals +++ b/Appraisals @@ -1,20 +1,3 @@ -appraise "rails-4.2" do - gem "activemodel", "~> 4.2" - gem "sqlite3", "~> 1.3.6" -end - -appraise "rails-5.0" do - gem "activemodel", "~> 5.0" - gem "activemodel-serializers-xml" - gem "sqlite3", "~> 1.3.6" -end - -appraise "rails-5.1" do - gem "activemodel", "~> 5.1" - gem "activemodel-serializers-xml" - gem "sqlite3", "~> 1.3.6" -end - appraise "rails-5.2" do gem "activemodel", "~> 5.2" gem "activemodel-serializers-xml" diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile deleted file mode 100644 index 60e93dd..0000000 --- a/gemfiles/rails_4.2.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activemodel", "~> 4.2" -gem "sqlite3", "~> 1.3.6" - -gemspec path: "../" diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile deleted file mode 100644 index b0878f1..0000000 --- a/gemfiles/rails_5.0.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activemodel", "~> 5.0" -gem "activemodel-serializers-xml" -gem "sqlite3", "~> 1.3.6" - -gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile deleted file mode 100644 index 2bde573..0000000 --- a/gemfiles/rails_5.1.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activemodel", "~> 5.1" -gem "activemodel-serializers-xml" -gem "sqlite3", "~> 1.3.6" - -gemspec path: "../" From 13f2cb35684f0d72c1e9d6da41951fa7df5a7cbb Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran <guilleiguaran@gmail.com> Date: Tue, 25 Apr 2023 20:39:36 -0700 Subject: [PATCH 2/2] Add ruby 2.6 for rails 5.2 --- .github/workflows/active_model_otp.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/active_model_otp.yml b/.github/workflows/active_model_otp.yml index ed1923f..3648192 100644 --- a/.github/workflows/active_model_otp.yml +++ b/.github/workflows/active_model_otp.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: gemfile: [rails_5.2, rails_6.0, rails_6.1, rails_7.0] - ruby-version: [2.7, 3.0, 3.1, 3.2] + ruby-version: [2.6, 2.7, 3.0, 3.1, 3.2] exclude: - { gemfile: rails_5.2, ruby-version: 2.7 } - { gemfile: rails_5.2, ruby-version: 3.0 } @@ -25,6 +25,7 @@ jobs: - { gemfile: rails_6.1, ruby-version: 3.0 } - { gemfile: rails_6.1, ruby-version: 3.1 } - { gemfile: rails_6.1, ruby-version: 3.2 } + - { gemfile: rails_7.0, ruby-version: 2.6 } env: BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile