From 74fd7ef817e8905dc53299abdd8c817e3b00db74 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Mon, 13 Jan 2025 16:43:22 +0900 Subject: [PATCH 1/3] Pin Rails 7.0 to work around the error 'DOMPurify is not defined' --- Appraisals | 4 ++-- gemfiles/composite_primary_keys.gemfile | 2 +- gemfiles/rails_7.0.gemfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Appraisals b/Appraisals index 112766ead..661de5795 100644 --- a/Appraisals +++ b/Appraisals @@ -52,7 +52,7 @@ appraise 'rails-6.1' do end appraise 'rails-7.0' do - gem 'rails', '~> 7.0.0' + gem 'rails', '~> 7.0.0', '7.0.8.6' # Pinning until the fix for https://github.com/basecamp/trix/issues/1209 become available in actiontext gem 'importmap-rails', require: false group :active_record do @@ -110,7 +110,7 @@ appraise 'rails-8.0' do end appraise 'composite_primary_keys' do - gem 'rails', '~> 7.0.0' + gem 'rails', '~> 7.0.0', '7.0.8.6' # Pinning until the fix for https://github.com/basecamp/trix/issues/1209 become available in actiontext group :active_record do gem 'composite_primary_keys' diff --git a/gemfiles/composite_primary_keys.gemfile b/gemfiles/composite_primary_keys.gemfile index 1ebba5c55..aec773bcd 100644 --- a/gemfiles/composite_primary_keys.gemfile +++ b/gemfiles/composite_primary_keys.gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gem "appraisal", ">= 2.0" gem "devise", "~> 4.7" gem "net-smtp", require: false -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.0.0", "7.0.8.6" gem "sassc-rails", "~> 2.1" gem "turbo-rails" gem "vite_rails", require: false diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 36f7ff8cf..ddc3cda32 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gem "appraisal", ">= 2.0" gem "devise", "~> 4.7" gem "net-smtp", require: false -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.0.0", "7.0.8.6" gem "sassc-rails", "~> 2.1" gem "turbo-rails" gem "vite_rails", require: false From c25f517fef1a864a98852064f5ef28ac5ef24530 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Mon, 13 Jan 2025 17:27:52 +0900 Subject: [PATCH 2/3] Pin Nokogiri version on JRuby to work around the issues in spec Like: https://github.com/railsadminteam/rails_admin/actions/runs/12742759076/job/35511426596 --- Appraisals | 1 + gemfiles/rails_7.0.gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/Appraisals b/Appraisals index 661de5795..4536cd633 100644 --- a/Appraisals +++ b/Appraisals @@ -54,6 +54,7 @@ end appraise 'rails-7.0' do gem 'rails', '~> 7.0.0', '7.0.8.6' # Pinning until the fix for https://github.com/basecamp/trix/issues/1209 become available in actiontext gem 'importmap-rails', require: false + gem 'nokogiri', '~> 1.16.0', platform: :jruby group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index ddc3cda32..3231bd209 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -12,6 +12,7 @@ gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" gem "importmap-rails", require: false +gem "nokogiri", "~> 1.16.0", platform: :jruby group :development, :test do gem "pry", ">= 0.9" From 1b2a8baa729378c0b220fda4aef793e8f6bd4eaf Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Sun, 9 Mar 2025 13:52:38 +0900 Subject: [PATCH 3/3] Fix Rails <= 7.0 builds failing due to change in concurrent-ruby --- Appraisals | 4 ++++ gemfiles/composite_primary_keys.gemfile | 1 + gemfiles/rails_6.0.gemfile | 1 + gemfiles/rails_6.1.gemfile | 1 + gemfiles/rails_7.0.gemfile | 1 + 5 files changed, 8 insertions(+) diff --git a/Appraisals b/Appraisals index 4536cd633..396784e3d 100644 --- a/Appraisals +++ b/Appraisals @@ -2,6 +2,7 @@ appraise 'rails-6.0' do gem 'rails', '~> 6.0.0' + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 gem 'psych', '~> 3.3' gem 'turbo-rails', '< 2.0.8' @@ -31,6 +32,7 @@ end appraise 'rails-6.1' do gem 'rails', '~> 6.1.0' + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 group :active_record do platforms :jruby do @@ -53,6 +55,7 @@ end appraise 'rails-7.0' do gem 'rails', '~> 7.0.0', '7.0.8.6' # Pinning until the fix for https://github.com/basecamp/trix/issues/1209 become available in actiontext + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 gem 'importmap-rails', require: false gem 'nokogiri', '~> 1.16.0', platform: :jruby @@ -112,6 +115,7 @@ end appraise 'composite_primary_keys' do gem 'rails', '~> 7.0.0', '7.0.8.6' # Pinning until the fix for https://github.com/basecamp/trix/issues/1209 become available in actiontext + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 group :active_record do gem 'composite_primary_keys' diff --git a/gemfiles/composite_primary_keys.gemfile b/gemfiles/composite_primary_keys.gemfile index aec773bcd..bcdbf29ec 100644 --- a/gemfiles/composite_primary_keys.gemfile +++ b/gemfiles/composite_primary_keys.gemfile @@ -11,6 +11,7 @@ gem "turbo-rails" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" group :development, :test do gem "pry", ">= 0.9" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 75954b32e..da86b4c65 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -11,6 +11,7 @@ gem "turbo-rails", "< 2.0.8" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" gem "psych", "~> 3.3" group :development, :test do diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index cdf08f0c8..8c883fc89 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -11,6 +11,7 @@ gem "turbo-rails" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" group :development, :test do gem "pry", ">= 0.9" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 3231bd209..1804f839b 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -11,6 +11,7 @@ gem "turbo-rails" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" gem "importmap-rails", require: false gem "nokogiri", "~> 1.16.0", platform: :jruby