Test against Rails 7.0

shioyama · Feb 16, 2022 · 62196ce · 62196ce
1 parent 8caaf84
commit 62196ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,6 +45,8 @@ jobs:
             version: '6.0'
           - name: 'active_record'
             version: '6.1'
+          - name: 'active_record'
+            version: '7.0'
           - name: 'sequel'
             version: '5'
         experimental: [false]
@@ -66,7 +68,7 @@ jobs:
             feature: 'rails'
             orm:
               name: 'active_record'
-              version: '6.1'
+              version: '7.0'
             database: 'sqlite3'
             experimental: false
           - ruby: '3.0'
@@ -80,27 +82,27 @@ jobs:
             feature: 'unit'
             orm:
               name: 'active_record'
-              version: '7.0'
+              version: 'edge'
             experimental: true
           - ruby: '3.0'
             database: 'mysql'
             feature: 'unit'
             orm:
               name: 'active_record'
-              version: '7.0'
+              version: 'edge'
             experimental: true
           - ruby: '3.0'
             database: 'postgres'
             feature: 'unit'
             orm:
               name: 'active_record'
-              version: '7.0'
+              version: 'edge'
             experimental: true
           - ruby: '2.7'
             feature: 'rails'
             orm:
               name: 'active_record'
-              version: '6.1'
+              version: '7.0'
             database: 'sqlite3'
             experimental: false
           - ruby: '2.7'
@@ -121,14 +123,14 @@ jobs:
             feature: 'unit'
             orm:
               name: 'active_record'
-              version: '7.0'
+              version: 'edge'
             experimental: true
           - ruby: '2.7'
             database: 'postgres'
             feature: 'unit'
             orm:
               name: 'active_record'
-              version: '7.0'
+              version: 'edge'
             experimental: true
         exclude:
           - ruby: '2.7'

diff --git a/Gemfile b/Gemfile
@@ -8,11 +8,11 @@ orm, orm_version = ENV['ORM'], ENV['ORM_VERSION']
 group :development, :test do
   case orm
   when 'active_record'
-    orm_version ||= '6.1'
+    orm_version ||= '7.0'
     case orm_version
-    when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1'
+    when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1', '7.0'
       gem 'activerecord', "~> #{orm_version}.0"
-    when '7.0'
+    when 'edge'
       git 'https://github.com/rails/rails.git', branch: 'main' do
         gem 'activerecord'
         gem 'activesupport'