From fbb1e36a890d8a2f8c38e34650374c2d1032b467 Mon Sep 17 00:00:00 2001 From: Masato Ohba Date: Mon, 19 Aug 2024 12:08:14 +0900 Subject: [PATCH] Run CI against Rails 7.2 (#33) * Add /gemfiles/vendor/ to .gitignore since the directory is used when installing by using Gemfile under gemfiles/ dir * Rails 6.1 or above should use rspec-rails 6.x to comply its policy https://github.com/rspec/rspec-rails/blob/d0e322b20bb713b200b66d4a7cc21a272d0b4374/README.md#L11-L16 * Rails 8.0 require sqlite3 2.0 or above https://github.com/rails/rails/pull/51958 * Add Ruby 3.3 x Rails 7.2 to test matrix --- .github/workflows/test.yml | 9 +++++++++ .gitignore | 1 + Appraisals | 6 ++++++ Gemfile.lock | 2 +- gemfiles/activerecord_6_1.gemfile | 2 +- gemfiles/activerecord_7_0.gemfile | 2 +- gemfiles/activerecord_7_1.gemfile | 2 +- gemfiles/activerecord_7_2.gemfile | 9 +++++++++ gemfiles/activerecord_master.gemfile | 4 ++-- 9 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 gemfiles/activerecord_7_2.gemfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2b1cb73..61221ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,6 +39,15 @@ jobs: - ruby: '3.2' activerecord: '7.1' gemfile: 'activerecord_7_1.gemfile' + - ruby: '3.1' + activerecord: '7.2' + gemfile: 'activerecord_7_2.gemfile' + - ruby: '3.2' + activerecord: '7.2' + gemfile: 'activerecord_7_2.gemfile' + - ruby: '3.3' + activerecord: '7.2' + gemfile: 'activerecord_7_2.gemfile' - ruby: '3.3' activerecord: 'HEAD' gemfile: 'activerecord_master.gemfile' diff --git a/.gitignore b/.gitignore index d342177..495a89f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /spec/reports/ /tmp/ /gemfiles/*.lock +/gemfiles/vendor/ # rspec failure tracking .rspec_status diff --git a/Appraisals b/Appraisals index e443541..32fc913 100644 --- a/Appraisals +++ b/Appraisals @@ -43,6 +43,12 @@ appraise "activerecord-7-1" do gem "rspec-rails", "~> 5.0" end +appraise "activerecord-7-2" do + gem "activerecord", "~> 7.2.0" + gem "sqlite3", "~> 1.4" + gem "rspec-rails", "~> 5.0" +end + appraise "activerecord-master" do git "https://github.com/rails/rails.git" do gem "rails" diff --git a/Gemfile.lock b/Gemfile.lock index 7cc98d1..1066372 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - after_commit_everywhere (1.3.1) + after_commit_everywhere (1.4.0) activerecord (>= 4.2) activesupport diff --git a/gemfiles/activerecord_6_1.gemfile b/gemfiles/activerecord_6_1.gemfile index ca54c86..87bf5da 100644 --- a/gemfiles/activerecord_6_1.gemfile +++ b/gemfiles/activerecord_6_1.gemfile @@ -4,6 +4,6 @@ source "https://rubygems.org" gem "activerecord", "~> 6.1.0" gem "sqlite3", "~> 1.4" -gem "rspec-rails", "~> 4.0" +gem "rspec-rails", "~> 6.0" gemspec path: "../" diff --git a/gemfiles/activerecord_7_0.gemfile b/gemfiles/activerecord_7_0.gemfile index 4723b95..6d33f41 100644 --- a/gemfiles/activerecord_7_0.gemfile +++ b/gemfiles/activerecord_7_0.gemfile @@ -4,6 +4,6 @@ source "https://rubygems.org" gem "activerecord", "~> 7.0.0" gem "sqlite3", "~> 1.4" -gem "rspec-rails", "~> 5.0" +gem "rspec-rails", "~> 6.0" gemspec path: "../" diff --git a/gemfiles/activerecord_7_1.gemfile b/gemfiles/activerecord_7_1.gemfile index 2c8333d..e9b3d0b 100644 --- a/gemfiles/activerecord_7_1.gemfile +++ b/gemfiles/activerecord_7_1.gemfile @@ -4,6 +4,6 @@ source "https://rubygems.org" gem "activerecord", "~> 7.1.0" gem "sqlite3", "~> 1.4" -gem "rspec-rails", "~> 5.0" +gem "rspec-rails", "~> 6.0" gemspec path: "../" diff --git a/gemfiles/activerecord_7_2.gemfile b/gemfiles/activerecord_7_2.gemfile new file mode 100644 index 0000000..4ce5faa --- /dev/null +++ b/gemfiles/activerecord_7_2.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activerecord", "~> 7.2.0" +gem "sqlite3", "~> 1.4" +gem "rspec-rails", "~> 6.0" + +gemspec path: "../" diff --git a/gemfiles/activerecord_master.gemfile b/gemfiles/activerecord_master.gemfile index ccff30d..bdbbe2c 100644 --- a/gemfiles/activerecord_master.gemfile +++ b/gemfiles/activerecord_master.gemfile @@ -7,7 +7,7 @@ git "https://github.com/rails/rails.git" do gem "activerecord" end -gem "sqlite3", "~> 1.4" -gem "rspec-rails", "~> 5.0" +gem "sqlite3", "~> 2.0" +gem "rspec-rails", "~> 6.0" gemspec path: "../"