From c82b7762085fcc4acdab78f451e8307c8fb00efc Mon Sep 17 00:00:00 2001 From: Watson Date: Wed, 28 Feb 2024 17:18:19 +0900 Subject: [PATCH 1/3] CI: Add mutex_m gem as dependency in rails 6.1 tests This patch will fix https://github.com/ohler55/oj/actions/runs/7908156404/job/21586745798 The mutex_m gem will be changed bundled gem since Ruby 3.4.0. To use bundled gem, it requires to specify the dependency in Gemfile. Ref. https://github.com/ohler55/oj/pull/901 --- gemfiles/rails_6.1.gemfile | 1 + gemfiles/rails_7.gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 2b4c9279..a28d35e4 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -4,5 +4,6 @@ source 'https://rubygems.org' gem 'rails', '6.1.3.1' gem 'sqlite3' +gem 'mutex_m' gemspec :path => '../' diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index 170e929d..ae592d0f 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -4,5 +4,6 @@ source 'https://rubygems.org' gem 'rails', '~> 7.0.3' gem 'sqlite3' +gem 'mutex_m' gemspec :path => '../' From 938ad16d5fe10ad64f969e1fd999285fe8ab0135 Mon Sep 17 00:00:00 2001 From: Watson Date: Wed, 28 Feb 2024 17:20:12 +0900 Subject: [PATCH 2/3] CI: Add base64 gem as dependency --- gemfiles/rails_6.1.gemfile | 1 + gemfiles/rails_7.gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index a28d35e4..c696d85d 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -5,5 +5,6 @@ source 'https://rubygems.org' gem 'rails', '6.1.3.1' gem 'sqlite3' gem 'mutex_m' +gem 'base64' gemspec :path => '../' diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index ae592d0f..bd375418 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -5,5 +5,6 @@ source 'https://rubygems.org' gem 'rails', '~> 7.0.3' gem 'sqlite3' gem 'mutex_m' +gem 'base64' gemspec :path => '../' From 0c032658f1d7cb72b7860de0a9efcbc7538e4f58 Mon Sep 17 00:00:00 2001 From: Watson Date: Wed, 28 Feb 2024 17:20:45 +0900 Subject: [PATCH 3/3] CI: Add drb gem as dependency --- gemfiles/rails_6.1.gemfile | 1 + gemfiles/rails_7.gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index c696d85d..e58f1b42 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -6,5 +6,6 @@ gem 'rails', '6.1.3.1' gem 'sqlite3' gem 'mutex_m' gem 'base64' +gem 'drb' gemspec :path => '../' diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index bd375418..ae4b39c6 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -6,5 +6,6 @@ gem 'rails', '~> 7.0.3' gem 'sqlite3' gem 'mutex_m' gem 'base64' +gem 'drb' gemspec :path => '../'