From 8947a8b797de84be89064fe0be07fdab79840219 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 7 Nov 2024 16:48:42 -0600 Subject: [PATCH 1/2] Start testing on Rails 8 final release --- .github/workflows/ruby.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 094be7eab7..81a90fe632 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -45,10 +45,10 @@ jobs: additional_name: [""] include: - ruby: "3.3" - rails_version: "8.0.0.rc2" + rails_version: "8.0.0" additional_engine_cart_rails_options: --css=bootstrap - ruby: "3.3" - rails_version: "8.0.0.rc2" + rails_version: "8.0.0" additional_engine_cart_rails_options: --css=bootstrap --js=esbuild additional_name: "/ esbuild" - ruby: "3.2" From abdd5e7ca09ae98a4eb04a59527cd4df6fef4f8b Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Fri, 8 Nov 2024 08:38:41 -0600 Subject: [PATCH 2/2] Ensure use of i18n-tasks ~> 1.0 Version 0.9 doesn't work with Rails 8 --- blacklight.gemspec | 2 +- spec/test_app_templates/Gemfile.extra | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/blacklight.gemspec b/blacklight.gemspec index b95e13e592..dcd5971398 100644 --- a/blacklight.gemspec +++ b/blacklight.gemspec @@ -49,6 +49,6 @@ Gem::Specification.new do |s| s.add_development_dependency "rubocop-capybara" s.add_development_dependency "rubocop-rspec_rails" s.add_development_dependency "rubocop-factory_bot" - s.add_development_dependency "i18n-tasks" + s.add_development_dependency "i18n-tasks", '~> 1.0' s.add_development_dependency "solr_wrapper" end diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra index 0db3fcbcd9..9a5c78518e 100644 --- a/spec/test_app_templates/Gemfile.extra +++ b/spec/test_app_templates/Gemfile.extra @@ -1,4 +1,5 @@ gem 'rails-controller-testing' +gem 'rails-i18n', github: 'Shopify/rails-i18n', branch: 'schwad_rails_8' unless ENV['VIEW_COMPONENT_VERSION'].to_s == "" gem 'view_component', ENV.fetch('VIEW_COMPONENT_VERSION')