From 00f3f40bcf445a4927122fbaef3f7873fd4a9d5a Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@gmail.com>
Date: Mon, 7 Oct 2024 15:38:33 -0400
Subject: [PATCH] Drop end of life rails < 7 and only support rubies 7
 supports, 2.7+

Drop ruby 2.5 and 2.6.
Drop rails 6.0 and 6.1.

Rails 7 is still supported and requires ruby 2.7 and higher so test with this minimal baseline.
---
 .github/workflows/ci.yaml | 20 ++++++++------------
 Gemfile                   | 11 +++++------
 ovirt_metrics.gemspec     |  4 ++--
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0cc6836..2482770 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,24 +11,20 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-        - '2.5'
-        - '2.6'
         - '2.7'
         - '3.0'
         - '3.1'
+        - '3.2'
+        - '3.3'
         rails-version:
-        - '6.0'
-        - '6.1'
-        include:
-        - ruby-version: '3.1'
-          rails-version: '6.1'
-        # rails 7 requires ruby 2.7+
+        - '7.0'
+        - '7.1'
+        - '7.2'
+        exclude:
         - ruby-version: '2.7'
-          rails-version: '7.0'
+          rails-version: '7.2'
         - ruby-version: '3.0'
-          rails-version: '7.0'
-        - ruby-version: '3.1'
-          rails-version: '7.0'
+          rails-version: '7.2'
     env:
       TEST_RAILS_VERSION: "${{ matrix.rails-version }}"
       CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}"
diff --git a/Gemfile b/Gemfile
index 6fee169..0bea6ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,14 +4,13 @@ gemspec
 
 minimum_version =
   case ENV['TEST_RAILS_VERSION']
-  when "6.0"
-    "~>6.0.4"
-  when "7.0"
-    "~>7.0.8"
+  when "7.2"
+    "~>7.2.1"
+  when "7.1"
+    "~>7.1.4"
   else
-    "~>6.1.4"
+    "~>7.0.8"
   end
-
 gem "activerecord", minimum_version
 
 # sqlite3 doesn't bundle properly with Rails 7.0 or less.
diff --git a/ovirt_metrics.gemspec b/ovirt_metrics.gemspec
index 74fd83b..377892c 100644
--- a/ovirt_metrics.gemspec
+++ b/ovirt_metrics.gemspec
@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.test_files   += %w[.rspec]
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5.8"
+  spec.required_ruby_version = ">= 2.7"
 
-  spec.add_dependency "activerecord", ">=6.0"
+  spec.add_dependency "activerecord", ">=7.0"
   spec.add_dependency "pg"
 
   spec.add_development_dependency "bundler"