From aa9a8ccb7410e33b8a7b5dd0211d48b2d4882b06 Mon Sep 17 00:00:00 2001 From: Alistair Norman Date: Fri, 23 Jan 2026 16:56:43 -0800 Subject: [PATCH 1/3] Update i18n-tasks i18n-tasks gets reverted to an earlier version when upgrading to Ruby 4. For some reason 0.9.0 allows Ruby 4 but 0.9.37 doesn't and reverting back to 0.9.0 introduces bugs that were fixed in subsequent versions. These versions are all quite old and we can now update to 1.1. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1723938863..c14cde31ce 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem 'rack', '< 3', require: false gem 'rake', require: false, groups: [:lint, :release] gem 'rails-controller-testing', require: false gem 'puma', '< 7', require: false -gem 'i18n-tasks', '~> 0.9', require: false +gem 'i18n-tasks', '~> 1.1.0', require: false gem 'rspec_junit_formatter', require: false gem 'yard', require: false gem 'db-query-matchers', require: false From 7880a1d7a8e8384801dd1131c0f76166ab9e81a7 Mon Sep 17 00:00:00 2001 From: Alistair Norman Date: Thu, 29 Jan 2026 10:59:17 -0800 Subject: [PATCH 2/3] CI: Test with Ruby 4.0 Until released needs solidus_auth_devise main branch for now --- .github/workflows/test_solidus.yml | 4 ++-- bin/rails-application-template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_solidus.yml b/.github/workflows/test_solidus.yml index 78ed094563..16bfe9efaa 100644 --- a/.github/workflows/test_solidus.yml +++ b/.github/workflows/test_solidus.yml @@ -38,8 +38,8 @@ jobs: database: sqlite storage: activestorage - rails: "8.1" - ruby: "3.4" - database: sqlite + ruby: "4.0" + database: postgres storage: activestorage env: BUNDLE_WITHOUT: "lint release" diff --git a/bin/rails-application-template b/bin/rails-application-template index c7af695c08..4a4b7ac4b8 100755 --- a/bin/rails-application-template +++ b/bin/rails-application-template @@ -18,7 +18,7 @@ if $0 == __FILE__ end gem 'solidus' -gem 'solidus_auth_devise' +gem 'solidus_auth_devise', github: 'solidusio/solidus_auth_devise', branch: 'main' gem 'rails_12factor' gem_group :heroku do From b17349651c8686d0659d2efa53b0726aeae80d7e Mon Sep 17 00:00:00 2001 From: Alistair Norman Date: Mon, 2 Feb 2026 10:06:58 -0800 Subject: [PATCH 3/3] Add benchmark to gemfile Benchmark is needed by Omnes as well as one test file in legacy promotions but neither gem has it as a dependency. It is also needed by mini_magick. It is no longer loaded from the standard library as of Ruby 4. --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index c14cde31ce..362269b810 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,7 @@ gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/) gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/) gem 'sqlite3', '>= 2.1', require: false if dbs.match?(/all|sqlite/) +gem 'benchmark', '~> 0.5', require: false gem 'database_cleaner', '~> 2.0', require: false gem 'rspec-activemodel-mocks', '~> 1.1', require: false gem 'rspec-rails', '~> 6.0.3', require: false