Skip to content

Commit 480c87b

Browse files
authored
Merge pull request #997 from rails-sqlserver/update-ci-matrix
Update CI matrix
2 parents 5decfd2 + fde9764 commit 480c87b

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby: [2.7.3, 3.0.1]
16+
ruby:
17+
- 2.7.5
18+
- 3.0.3
19+
- 3.1.0
1720

1821
steps:
1922
- name: Checkout code

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Interested in older versions? We follow a rational versioning policy that tracks
1313

1414
| Adapter Version | Rails Version | Support |
1515
| --------------- | ------------- | ------------------------------------------------------------------------------------------- |
16-
| `7.0.0.0` | `7.0.x` | [unreleased](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main) |
16+
| `7.0.0.0.rc1` | `7.0.x` | [unreleased](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main) |
1717
| `6.1.2.1` | `6.1.x` | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
1818
| `6.0.2` | `6.0.x` | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |
1919
| `5.2.1` | `5.2.x` | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable) |

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.0.0.0-beta.1
1+
7.0.0.0.rc1

test/cases/coerced_tests.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,8 @@ class YamlSerializationTest < ActiveRecord::TestCase
14861486
coerce_tests! :test_types_of_virtual_columns_are_not_changed_on_round_trip
14871487
def test_types_of_virtual_columns_are_not_changed_on_round_trip_coerced
14881488
author = Author.select("authors.*, 5 as posts_count").first
1489-
dumped = YAML.load(YAML.dump(author))
1489+
dumped_author = YAML.dump(author)
1490+
dumped = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(dumped_author) : YAML.load(dumped_author)
14901491
assert_equal 5, author.posts_count
14911492
assert_equal 5, dumped.posts_count
14921493
end

test/cases/rake_test_sqlserver.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ class SQLServerRakeSchemaCacheDumpLoadTest < SQLServerRakeTest
176176
it "dumps schema cache with SQL Server metadata" do
177177
quietly { db_tasks.dump_schema_cache connection, filename }
178178

179-
schema_cache = YAML.load(File.read(filename))
179+
filedata = File.read(filename)
180+
schema_cache = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(filedata) : YAML.load(filedata)
180181

181182
col_id, col_name = connection.schema_cache.columns("users")
182183

0 commit comments

Comments
 (0)