Also test with rails 7, find all the broken things

ManageIQ · Jan 17, 2024 · 39107b0 · 39107b0
1 parent a4c58c3
commit 39107b0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,6 +15,9 @@ jobs:
         - '2.7'
         - '3.0'
         - '3.1'
+        rails-version:
+        - '6.1'
+        - '7.0'
     services:
       postgres:
         image: postgres:13
@@ -39,6 +42,7 @@ jobs:
       PGPORT: 5432
       PGUSER: postgres
       PGPASSWORD: password
+      TEST_RAILS_VERSION: ${{ matrix.rails-version }}
       # for the mysql cli (mysql, mysqladmin)
       MYSQL_HOST: 127.0.0.1
       MYSQL_PWD: password
@@ -64,7 +68,7 @@ jobs:
           DB: mysql2
         run: bundle exec rake
       - name: Report code coverage
-        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
+        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' && matrix.rails-version == '6.1' }}
         continue-on-error: true
         uses: paambaati/codeclimate-action@v5
         env:

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.1.4"
+minimum_version =
+  case ENV['TEST_RAILS_VERSION']
+  when "7.0"
+    "~>7.0.8"
+  else
+    "~>6.1.4"
+  end
+
+gem "activerecord", minimum_version
 gem "mysql2"
 gem "pg"
 gem "sqlite3"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -41,3 +41,7 @@
     end
   end
 end
+
+require "active_record"
+puts
+puts "\e[93mUsing ActiveRecord #{ActiveRecord.version}\e[0m"
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,3 +41,7 @@ @@
         end
       end
     end
+    require "active_record"
+    puts
+    puts "\e[93mUsing ActiveRecord #{ActiveRecord.version}\e[0m"