Refresh CI configuration: update matrix, fix dependencies

evilmartians · Feb 7, 2025 · 0f599d6 · 0f599d6
1 parent 58c2564
commit 0f599d6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,30 +19,48 @@ jobs:
           - ruby: "head"
             activerecord: "head"
             database: sqlite
+          - ruby: "3.4"
+            activerecord: "8.0"
+            database: postgresql
+          - ruby: "3.4"
+            activerecord: "8.0"
+            database: mysql
+          - ruby: "3.4"
+            activerecord: "8.0"
+            database: sqlite
           - ruby: "3.3"
-            activerecord: "7.1"
+            activerecord: "7.2"
             database: postgresql
           - ruby: "3.3"
-            activerecord: "7.1"
+            activerecord: "7.2"
             database: mysql
           - ruby: "3.3"
-            activerecord: "7.1"
+            activerecord: "7.2"
             database: sqlite
           - ruby: "3.2"
-            activerecord: "7.0"
+            activerecord: "7.1"
+            database: postgresql
+          - ruby: "3.2"
+            activerecord: "7.1"
+            database: mysql
+          - ruby: "3.2"
+            activerecord: "7.1"
             database: sqlite
           - ruby: "3.1"
-            activerecord: "6.1"
+            activerecord: "7.0"
             database: sqlite
           - ruby: "3.0"
+            activerecord: "6.1"
+            database: sqlite
+          - ruby: "2.7"
             activerecord: "6.0"
             database: sqlite
 
     runs-on: ubuntu-latest
 
     services:
       postgres:
-        image: postgres:16
+        image: ${{ (matrix.database == 'postgresql') && 'postgres:17' || '' }}
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -54,7 +72,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
       mysql:
-        image: mysql:8.4
+        image: ${{ (matrix.database == 'mysql') && 'mysql:9' || '' }}
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: evil_seed_test

diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in evil-seed.gemspec
 gemspec
 
-activerecord_version = ENV.fetch("ACTIVERECORD_VERSION", "~> 7.1")
+activerecord_version = ENV.fetch("ACTIVERECORD_VERSION", "~> 8.0")
 case activerecord_version.upcase
 when "HEAD"
   git "https://github.com/rails/rails.git" do
@@ -15,5 +15,10 @@ when "HEAD"
 else
   activerecord_version = "~> #{activerecord_version}.0" if activerecord_version.match?(/^\d+\.\d+$/)
   gem "activerecord", activerecord_version
-  gem "sqlite3", "~> 1.4"
+  if Gem::Version.new("7.2") > Gem::Version.new(activerecord_version.scan(/\d+\.\d+/).first)
+    gem "sqlite3", "~> 1.4"
+    gem "concurrent-ruby", "< 1.3.5"
+  end
 end
+
+gem "debug"
diff --git a/test/evil_seed_test.rb b/test/evil_seed_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'test_helper'
-
+require 'debug'
 class EvilSeedTest < Minitest::Test
   def setup
     EvilSeed.configure do |config|