From f3ec92932b6e0d2d5ec0779b529fc20741c965b6 Mon Sep 17 00:00:00 2001
From: Petrik <petrik@deheus.net>
Date: Wed, 13 Mar 2024 20:40:46 +0100
Subject: [PATCH] Remove tests for EOL versions of Ruby and Rails

---
 .github/workflows/build.yml                   | 19 +++++--------------
 Gemfile                                       |  4 ++--
 ...ecord-5.2.x => Gemfile.activerecord-7.0.x} |  3 +--
 ...ecord-6.0.x => Gemfile.activerecord-7.1.x} |  3 +--
 4 files changed, 9 insertions(+), 20 deletions(-)
 rename gemfiles/{Gemfile.activerecord-5.2.x => Gemfile.activerecord-7.0.x} (59%)
 rename gemfiles/{Gemfile.activerecord-6.0.x => Gemfile.activerecord-7.1.x} (59%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc01f48..5547434 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,24 +11,15 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - "3.3"
+          - "3.2"
+          - "3.1"
           - "3.0"
-          - "2.7"
-          - "2.6"
-          - "2.5"
         rails:
-          - "5.2"
-          - "6.0"
           - "6.1"
+          - "7.0"
+          - "7.1"
           - main
-        exclude:
-          - ruby: 2.5
-            rails: main
-          - ruby: 2.6
-            rails: main
-          - ruby: 3.0
-            rails: "5.1"
-          - ruby: 3.0
-            rails: "5.2"
 
     runs-on: 'ubuntu-latest'
 
diff --git a/Gemfile b/Gemfile
index 4a76ae0..7f7e84a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,11 @@
 # A sample Gemfile
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
 group :test do
   gem "rspec", "~> 3.0"
-  gem "activerecord", ">= 5.2.0"
+  gem "activerecord", ">= 5.2.8.1"
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
   gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 end
diff --git a/gemfiles/Gemfile.activerecord-5.2.x b/gemfiles/Gemfile.activerecord-7.0.x
similarity index 59%
rename from gemfiles/Gemfile.activerecord-5.2.x
rename to gemfiles/Gemfile.activerecord-7.0.x
index fa37d51..c89815c 100644
--- a/gemfiles/Gemfile.activerecord-5.2.x
+++ b/gemfiles/Gemfile.activerecord-7.0.x
@@ -3,7 +3,6 @@ source "http://rubygems.org"
 
 group :test do
   gem "rspec"
-  gem "activerecord", "~>5.2.0"
+  gem "activerecord", "~>7.0.0"
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 end
diff --git a/gemfiles/Gemfile.activerecord-6.0.x b/gemfiles/Gemfile.activerecord-7.1.x
similarity index 59%
rename from gemfiles/Gemfile.activerecord-6.0.x
rename to gemfiles/Gemfile.activerecord-7.1.x
index 2b01e7d..801928d 100644
--- a/gemfiles/Gemfile.activerecord-6.0.x
+++ b/gemfiles/Gemfile.activerecord-7.1.x
@@ -3,7 +3,6 @@ source "http://rubygems.org"
 
 group :test do
   gem "rspec"
-  gem "activerecord", "~>6.0.0"
+  gem "activerecord", "~>7.1.0"
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 end