Use different versions of psych for different versions of rails

samvera · Dec 19, 2022 · 11288c3 · 11288c3
1 parent 3c9535a
commit 11288c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -44,8 +44,13 @@ else
 end
 # END ENGINE_CART BLOCK
 
+if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^6.0/
+  gem 'psych', '< 5'
+end
+
 if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5/
   gem 'rails-controller-testing'
+  gem 'psych', '< 5'
 end
 
 gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'ruby3'

diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra
@@ -7,6 +7,10 @@ gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch
 #  gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
 #end
 
+if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^6.0/ || ENV['RAILS_VERSION'] =~ /^5/
+  gem 'psych', '< 5'
+end
+
 if ENV['BLACKLIGHT_VERSION']
   gem 'blacklight', ENV['BLACKLIGHT_VERSION']
 end