From 0489447fc1ee781d8ace181d63d0d95f00671a19 Mon Sep 17 00:00:00 2001 From: Simon Mathieu Date: Mon, 30 Oct 2023 16:55:43 -0700 Subject: [PATCH 1/4] Relax ActiveRecord dependency --- schema_validations.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema_validations.gemspec b/schema_validations.gemspec index 0ab2d08..76b34bf 100644 --- a/schema_validations.gemspec +++ b/schema_validations.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |gem| gem.required_ruby_version = '>= 2.5' gem.add_dependency 'schema_plus_columns', '~> 1.0.1' - gem.add_dependency 'activerecord', '>= 5.2', '< 7.1' + gem.add_dependency 'activerecord', '>= 5.2' gem.add_dependency 'valuable' gem.add_development_dependency 'rake', '~> 13.0' From 56133c35a84267ea867afc281edde07a4804d10a Mon Sep 17 00:00:00 2001 From: Simon Mathieu Date: Mon, 30 Oct 2023 17:01:03 -0700 Subject: [PATCH 2/4] Add CI step for 7.1 Rails --- .github/workflows/prs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/prs.yml b/.github/workflows/prs.yml index aafbf0b..c352399 100644 --- a/.github/workflows/prs.yml +++ b/.github/workflows/prs.yml @@ -28,6 +28,7 @@ jobs: - '6.0' - '6.1' - '7.0' + - '7.1' db: - mysql2 - sqlite3 From 60a17180d6e95702aae93bd29489bfa6090f22bf Mon Sep 17 00:00:00 2001 From: Simon Mathieu Date: Mon, 30 Oct 2023 17:03:18 -0700 Subject: [PATCH 3/4] Add required gemfiles --- gemfiles/activerecord-7.1/Gemfile.base | 4 ++++ gemfiles/activerecord-7.1/Gemfile.mysql2 | 10 ++++++++++ gemfiles/activerecord-7.1/Gemfile.postgresql | 10 ++++++++++ gemfiles/activerecord-7.1/Gemfile.sqlite3 | 10 ++++++++++ 4 files changed, 34 insertions(+) create mode 100644 gemfiles/activerecord-7.1/Gemfile.base create mode 100644 gemfiles/activerecord-7.1/Gemfile.mysql2 create mode 100644 gemfiles/activerecord-7.1/Gemfile.postgresql create mode 100644 gemfiles/activerecord-7.1/Gemfile.sqlite3 diff --git a/gemfiles/activerecord-7.1/Gemfile.base b/gemfiles/activerecord-7.1/Gemfile.base new file mode 100644 index 0000000..8d5ea3b --- /dev/null +++ b/gemfiles/activerecord-7.1/Gemfile.base @@ -0,0 +1,4 @@ +base_gemfile = File.expand_path('../../Gemfile.base', __FILE__) +eval File.read(base_gemfile) + +gem "activerecord", ">= 7.1", "< 7.2" diff --git a/gemfiles/activerecord-7.1/Gemfile.mysql2 b/gemfiles/activerecord-7.1/Gemfile.mysql2 new file mode 100644 index 0000000..832c90b --- /dev/null +++ b/gemfiles/activerecord-7.1/Gemfile.mysql2 @@ -0,0 +1,10 @@ +base_gemfile = File.expand_path('../Gemfile.base', __FILE__) +eval File.read(base_gemfile), binding, base_gemfile + +platform :ruby do + gem "mysql2" +end + +platform :jruby do + gem 'activerecord-jdbcmysql-adapter' +end diff --git a/gemfiles/activerecord-7.1/Gemfile.postgresql b/gemfiles/activerecord-7.1/Gemfile.postgresql new file mode 100644 index 0000000..1716cd8 --- /dev/null +++ b/gemfiles/activerecord-7.1/Gemfile.postgresql @@ -0,0 +1,10 @@ +base_gemfile = File.expand_path('../Gemfile.base', __FILE__) +eval File.read(base_gemfile), binding, base_gemfile + +platform :ruby do + gem "pg" +end + +platform :jruby do + gem 'activerecord-jdbcpostgresql-adapter' +end diff --git a/gemfiles/activerecord-7.1/Gemfile.sqlite3 b/gemfiles/activerecord-7.1/Gemfile.sqlite3 new file mode 100644 index 0000000..3d85216 --- /dev/null +++ b/gemfiles/activerecord-7.1/Gemfile.sqlite3 @@ -0,0 +1,10 @@ +base_gemfile = File.expand_path('../Gemfile.base', __FILE__) +eval File.read(base_gemfile), binding, base_gemfile + +platform :ruby do + gem "sqlite3" +end + +platform :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2' +end From c024a549a20f6b68c46b1769614e220dad601d13 Mon Sep 17 00:00:00 2001 From: Simon Mathieu Date: Mon, 30 Oct 2023 17:07:05 -0700 Subject: [PATCH 4/4] Remove some failing ruby version for ActiveRecord 7.1 --- .github/workflows/prs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/prs.yml b/.github/workflows/prs.yml index c352399..fa6e52d 100644 --- a/.github/workflows/prs.yml +++ b/.github/workflows/prs.yml @@ -42,6 +42,8 @@ jobs: activerecord: '5.2' - ruby: '2.5' activerecord: '7.0' + - ruby: '2.5' + activerecord: '7.1' - db: skip dbversion: skip include: