Skip to content

Commit

Permalink
test: remove psych from gemfile (#3011)
Browse files Browse the repository at this point in the history
**What problem is this PR intended to solve?**

Revert commit
59e4981
which avoided versions of psych that don't work on JRuby
  • Loading branch information
flavorjones authored Oct 22, 2023
2 parents f608e9d + 89c109a commit 49a0688
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,3 @@ end
group :rdoc do
gem "rdoc", "6.5.0"
end

gem "psych", "!= 5.1.1", "!= 5.1.0" # https://github.com/ruby/psych/issues/655
2 changes: 1 addition & 1 deletion test/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

require "minitest/autorun"
require "minitest/benchmark"
if ENV["NCPU"]
if ENV["NCPU"] && !Nokogiri.jruby?
require "minitest/parallel_fork"
warn "Running parallel tests with NCPU=#{ENV["NCPU"].inspect}"
end
Expand Down

0 comments on commit 49a0688

Please sign in to comment.