From 44a04733cbb28903945ef8d784f5c9c09765cb3c Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Thu, 4 Jan 2024 17:28:33 +0900 Subject: [PATCH 1/3] Test against Ruby 3.3 --- .github/workflows/tests.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 04a1ce2..6b29ea7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,6 +8,7 @@ jobs: strategy: matrix: ruby_version: + - '3.3' - '3.2' - '3.1' - '3.0' @@ -25,6 +26,18 @@ jobs: - gemfiles/rails_50.gemfile - gemfiles/rails_42.gemfile exclude: + - ruby_version: '3.3' + gemfile: gemfiles/rails_61.gemfile + - ruby_version: '3.3' + gemfile: gemfiles/rails_60.gemfile + - ruby_version: '3.3' + gemfile: gemfiles/rails_52.gemfile + - ruby_version: '3.3' + gemfile: gemfiles/rails_51.gemfile + - ruby_version: '3.3' + gemfile: gemfiles/rails_50.gemfile + - ruby_version: '3.3' + gemfile: gemfiles/rails_42.gemfile - ruby_version: '3.2' gemfile: gemfiles/rails_61.gemfile - ruby_version: '3.2' @@ -112,7 +125,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - run: bundle exec rake From 18bda05e6fab32aa11de59726757459eee31159f Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Thu, 4 Jan 2024 17:30:55 +0900 Subject: [PATCH 2/3] Test against Rails 7.1 --- .github/workflows/tests.yml | 11 ++++++++++- Appraisals | 6 +++--- gemfiles/rails_71.gemfile | 6 +++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6b29ea7..971dbcf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,6 +18,7 @@ jobs: - 'jruby-9.3' - 'jruby-9.4' gemfile: + - gemfiles/rails_71.gemfile - gemfiles/rails_70.gemfile - gemfiles/rails_61.gemfile - gemfiles/rails_60.gemfile @@ -68,6 +69,8 @@ jobs: gemfile: gemfiles/rails_50.gemfile - ruby_version: '3.0' gemfile: gemfiles/rails_42.gemfile + - ruby_version: '2.7' + gemfile: gemfiles/rails_71.gemfile - ruby_version: '2.7' gemfile: gemfiles/rails_70.gemfile - ruby_version: '2.7' @@ -78,12 +81,18 @@ jobs: gemfile: gemfiles/rails_50.gemfile - ruby_version: '2.7' gemfile: gemfiles/rails_42.gemfile + - ruby_version: '2.6' + gemfile: gemfiles/rails_71.gemfile - ruby_version: '2.6' gemfile: gemfiles/rails_70.gemfile - ruby_version: '2.6' gemfile: gemfiles/rails_42.gemfile + - ruby_version: '2.5' + gemfile: gemfiles/rails_71.gemfile - ruby_version: '2.5' gemfile: gemfiles/rails_70.gemfile + - ruby_version: 'jruby-9.3' + gemfile: gemfiles/rails_71.gemfile - ruby_version: 'jruby-9.3' gemfile: gemfiles/rails_70.gemfile - ruby_version: 'jruby-9.3' @@ -139,7 +148,7 @@ jobs: - 'jruby-head' gemfile: - gemfiles/rails_edge.gemfile - - gemfiles/rails_70.gemfile + - gemfiles/rails_71.gemfile runs-on: ubuntu-22.04 env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} diff --git a/Appraisals b/Appraisals index 2a1c48b..3a7b32c 100644 --- a/Appraisals +++ b/Appraisals @@ -44,9 +44,9 @@ appraise "rails_70" do end appraise "rails_71" do - gem "activesupport", "~> 7.1.0.rc2" - gem "actionpack", "~> 7.1.0.rc2" - gem "railties", "~> 7.1.0.rc2" + gem "activesupport", "~> 7.1.0" + gem "actionpack", "~> 7.1.0" + gem "railties", "~> 7.1.0" end appraise "rails_edge" do diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile index a18a7b5..e3b7305 100644 --- a/gemfiles/rails_71.gemfile +++ b/gemfiles/rails_71.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "activesupport", "~> 7.1.0.rc2" -gem "actionpack", "~> 7.1.0.rc2" -gem "railties", "~> 7.1.0.rc2" +gem "activesupport", "~> 7.1.0" +gem "actionpack", "~> 7.1.0" +gem "railties", "~> 7.1.0" gemspec path: "../" From 278297c62ee3b96aed5a182b39314e1a98325d4f Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Thu, 4 Jan 2024 17:32:52 +0900 Subject: [PATCH 3/3] Do not consider Rails edge failures to be actual failures --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 971dbcf..49a2535 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -136,7 +136,7 @@ jobs: with: ruby-version: 3.3 bundler-cache: true - - run: bundle exec rake + - run: bundle exec rake || echo "Rails edge test is done." ruby_edge: needs: