Merge branch 'zdennis:master' into feature--add-trilogy-adapter

zdennis · Nov 9, 2023 · 0d0f2ea · 0d0f2ea
2 parents 1b9ea07 + 9616c6d
commit 0d0f2ea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -22,11 +22,16 @@ jobs:
  ruby:
  - 3.2
  env:
+ - AR_VERSION: '7.1'
+ RUBYOPT: --enable-frozen-string-literal
  - AR_VERSION: '7.0'
  RUBYOPT: --enable-frozen-string-literal
  - AR_VERSION: 6.1
  RUBYOPT: --enable-frozen-string-literal
  include:
+ - ruby: 3.1
+ env:
+ AR_VERSION: '7.1'
  - ruby: 3.1
  env:
  AR_VERSION: '7.0'
@@ -71,7 +76,7 @@ jobs:
  AR_VERSION: ${{ matrix.env.AR_VERSION }}
  DB_DATABASE: activerecord_import_test
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  - uses: ruby/setup-ruby@v1
  with:
  ruby-version: ${{ matrix.ruby }}
@@ -110,7 +115,7 @@ jobs:
  env:
  AR_VERSION: '7.0'
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  - uses: ruby/setup-ruby@v1
  with:
  ruby-version: 2.7

diff --git a/gemfiles/7.1.gemfile b/gemfiles/7.1.gemfile
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+gem 'activerecord', '~> 7.1.0'
diff --git a/test/schema/generic_schema.rb b/test/schema/generic_schema.rb
@@ -2,8 +2,10 @@
 
 ActiveRecord::Schema.define do
  create_table :schema_info, force: :cascade do |t|
- t.integer :version, unique: true
+ t.integer :version
  end
+ add_index :schema_info, :version, unique: true
+
  SchemaInfo.create version: SchemaInfo::VERSION
 
  create_table :group, force: :cascade do |t|