From b0685b8c4fc976facba18f6324defb7e48d1abcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 10 Dec 2024 17:13:57 +0100
Subject: [PATCH] Add `base64` / `mutex_m` dependencies for Rails 6.1

These are required for Ruby 3.4 support, which extracts `base64` /
`mutex_m` into bundled gem. The maintained versions of Rails have the
dependencies updated.
---
 .github/workflows/ruby.yml   | 3 +++
 gemfiles/Gemfile.rails-6.1.x | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index d61b0994..e2cf4db1 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -26,6 +26,9 @@ jobs:
           - gemfiles/Gemfile.rails-7.1.x
           - gemfiles/Gemfile.rails-main
         exclude:
+          # Rails 6.1 are in mRuby 3.0 is not supported by Rails main (requires at least Ruby 3.1)
+          - ruby_version: head
+            gemfile: gemfiles/Gemfile.rails-6.1.x
           # Ruby 3.0 is not supported by Rails main (requires at least Ruby 3.1)
           - ruby_version: '3.0'
             gemfile: gemfiles/Gemfile.rails-main
diff --git a/gemfiles/Gemfile.rails-6.1.x b/gemfiles/Gemfile.rails-6.1.x
index 6f67f785..43481a60 100644
--- a/gemfiles/Gemfile.rails-6.1.x
+++ b/gemfiles/Gemfile.rails-6.1.x
@@ -8,6 +8,8 @@ gem 'test_declarative', '0.0.6'
 gem 'rake'
 gem 'minitest', '~> 5.14'
 gem 'racc'
+gem 'base64'
+gem 'mutex_m'
 
 platforms :mri do
   gem 'oj'