From 4183e7c44cf1fdf07244f11d27e0037e2db3a4bf Mon Sep 17 00:00:00 2001 From: Shinichi Maeshima Date: Fri, 2 May 2025 11:40:58 +0900 Subject: [PATCH 1/2] Add Ruby 3.4 to the test matrix --- .github/workflows/ruby.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 1a7c58e..1e4f05d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3'] + ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4'] gemfile: - rails_6_1 - rails_7_0 @@ -26,6 +26,12 @@ jobs: - rails_7_2 - rails_8_0 exclude: + - ruby-version: '3.4' + gemfile: rails_6_1 + - ruby-version: '3.4' + gemfile: rails_7_0 + - ruby-version: '3.4' + gemfile: rails_7_1 - ruby-version: '3.3' gemfile: rails_6_1 - ruby-version: '3.3' From 10cafd955aed788dacae532a5b8419cadeff032c Mon Sep 17 00:00:00 2001 From: Shinichi Maeshima Date: Fri, 2 May 2025 11:45:02 +0900 Subject: [PATCH 2/2] Fix broken ci in Rails 6.1 and 7.0 due to concurrent-ruby MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref: [Remove dependency on logger by eregon · Pull Request #1062 · ruby-concurrency/concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby/pull/1062) --- gemfiles/rails_6_1.gemfile | 2 +- gemfiles/rails_7_0.gemfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 8248015..87bd039 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -2,5 +2,5 @@ source "https://rubygems.org" gem "rails", "~> 6.1.0" gem "sqlite3", "~> 1.4" - +gem "concurrent-ruby", "< 1.3.5" gemspec path: '../' diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index 6872fb9..9ebf509 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -2,5 +2,6 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" gem "sqlite3", "~> 1.4" +gem "concurrent-ruby", "< 1.3.5" gemspec path: '../'