From 10ec81b40143ff41e838e233c884dd5b2d543c3b Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 17 Dec 2024 18:05:53 +0000 Subject: [PATCH 1/2] Relax FFI constraint --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 688f8d499..5df5cc6e4 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ group :documentation do end gem 'capybara' -gem 'ffi', '~> 1.15.5' +gem 'ffi', '> 1.15.5' gem 'rake', '> 12' gem 'rubocop', '~> 1.28.2' From decfd72e9b399c0018ea02bbaefb8c900cd523c9 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 17 Dec 2024 20:49:36 +0000 Subject: [PATCH 2/2] Handle Ruby 3.1 rubgygems minimum --- script/update_rubygems_and_install_bundler | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler index c2673e341..aa87daca6 100755 --- a/script/update_rubygems_and_install_bundler +++ b/script/update_rubygems_and_install_bundler @@ -11,9 +11,21 @@ function is_ruby_3_plus { fi } -if is_ruby_3_plus; then +function is_ruby_3_1_plus { + if ruby -e "exit(RUBY_VERSION.to_f >= 3.1)"; then + return 0 + else + return 1 + fi +} + + +if is_ruby_3_1_plus; then gem update --no-document --system gem install --no-document bundler +elif is_ruby_3_plus; then + gem update --no-document --system '3.5.23' + gem install --no-document bundler else gem update --no-document --system '3.4.22' gem install --no-document bundler