From f865bab3580e9f56a0288f4b6d16b146380235a3 Mon Sep 17 00:00:00 2001
From: Mark <markoudev@users.noreply.github.com>
Date: Tue, 7 Jan 2025 10:01:46 +0100
Subject: [PATCH] Update Ruby and Rails versions in CI matrix

---
 .github/workflows/ci.yml                               | 9 ++-------
 test/gemfiles/rails-5.2.gemfile                        | 3 ---
 test/gemfiles/rails-6.0.gemfile                        | 3 ---
 test/gemfiles/{rails-5.0.gemfile => rails-7.1.gemfile} | 2 +-
 test/gemfiles/{rails-5.1.gemfile => rails-8.0.gemfile} | 2 +-
 5 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 test/gemfiles/rails-5.2.gemfile
 delete mode 100644 test/gemfiles/rails-6.0.gemfile
 rename test/gemfiles/{rails-5.0.gemfile => rails-7.1.gemfile} (62%)
 rename test/gemfiles/{rails-5.1.gemfile => rails-8.0.gemfile} (62%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4307f11..44547ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,13 +11,8 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        ruby: [ "3.3", "3.2", "3.1", "3.0" ]
-        rails: [ "7.0", "6.1"]
-        include:
-          - { ruby: "2.7", rails: "6.0" }
-          - { ruby: "2.7", rails: "5.2" }
-          - { ruby: "2.7", rails: "5.1" }
-          - { ruby: "2.7", rails: "5.0" }
+        ruby: [ "3.3", "3.2", "3.1" ]
+        rails: [ "8.0", "7.1", "7.0", "6.1" ]
     name: "tests (Ruby: ${{ matrix.ruby }}, Rails: ${{ matrix.rails }})"
     runs-on: ubuntu-latest
     env:
diff --git a/test/gemfiles/rails-5.2.gemfile b/test/gemfiles/rails-5.2.gemfile
deleted file mode 100644
index d2f0191..0000000
--- a/test/gemfiles/rails-5.2.gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-gemspec path: "../.."
-gem "activerecord", "~> 5.2.0"
diff --git a/test/gemfiles/rails-6.0.gemfile b/test/gemfiles/rails-6.0.gemfile
deleted file mode 100644
index 445644b..0000000
--- a/test/gemfiles/rails-6.0.gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-gemspec path: "../.."
-gem "activerecord", "~> 6.0.0"
diff --git a/test/gemfiles/rails-5.0.gemfile b/test/gemfiles/rails-7.1.gemfile
similarity index 62%
rename from test/gemfiles/rails-5.0.gemfile
rename to test/gemfiles/rails-7.1.gemfile
index 2d7d4f0..f43c417 100644
--- a/test/gemfiles/rails-5.0.gemfile
+++ b/test/gemfiles/rails-7.1.gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 gemspec path: "../.."
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 7.1.0"
diff --git a/test/gemfiles/rails-5.1.gemfile b/test/gemfiles/rails-8.0.gemfile
similarity index 62%
rename from test/gemfiles/rails-5.1.gemfile
rename to test/gemfiles/rails-8.0.gemfile
index 4dda832..4a9f4e9 100644
--- a/test/gemfiles/rails-5.1.gemfile
+++ b/test/gemfiles/rails-8.0.gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 gemspec path: "../.."
-gem "activerecord", "~> 5.1.0"
+gem "activerecord", "~> 8.0.0"