Change

mrkamel · May 29, 2024 · e375ef9 · e375ef9
1 parent 0e7176b
commit e375ef9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
-        rails: ["rails5", "rails6", "rails7", "rails7.1"]
+        rails: ["rails5", "rails6", "rails7"]
         database: ["sqlite", "postgres", "mysql"]
         exclude:
           - ruby: "3.0"
@@ -18,6 +18,10 @@ jobs:
             rails: "rails5"
           - ruby: "3.3"
             rails: "rails5"
+        include:
+          - ruby: "3.3"
+            rails: "rails7-trilogy"
+            database: "mysql"
     services:
       postgres:
         image: styriadigital/postgres_hstore:10

diff --git a/gemfiles/rails7.1.gemfile → gemfiles/rails7-trilogy.gemfile b/gemfiles/rails7.1.gemfile → gemfiles/rails7-trilogy.gemfile
@@ -8,12 +8,9 @@ platforms :ruby do
   gem "bundler"
   gem "factory_bot"
   gem "minitest"
-  gem "mysql2"
   gem "trilogy"
-  gem "pg"
   gem "rake"
   gem "rubocop"
-  gem "sqlite3", "~> 1.7"
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails7.gemfile b/gemfiles/rails7.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.8"
+gem "activerecord", "~> 7.0"
 
 platforms :ruby do
   gem "bundler"

diff --git a/test/database.yml b/test/database.yml
@@ -4,7 +4,7 @@ sqlite:
   database: ":memory:"
 
 mysql:
-  adapter: <%= DATABASE == "mysql" && ActiveRecord::VERSION::STRING.to_f >= 7.1 ? "trilogy" : "mysql2" %>
+  adapter: <%= DATABASE == "mysql" && defined?(Trilogy) ? "trilogy" : "mysql2" %>
   database: search_cop
   host: 127.0.0.1
   username: root