Skip to content

Commit 3b9c736

Browse files
authored
Merge pull request #2717 from sparklemotion/flavorjones-lock-psych-to-fix-build_v1.13.x
dep(dev): pin psych to v4 until v5 builds in CI (backport)
2 parents a16b4bf + 2efa87b commit 3b9c736

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

nokogiri.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ Gem::Specification.new do |spec|
325325
spec.add_development_dependency("hoe-markdown", "~> 1.4")
326326
spec.add_development_dependency("minitest", "~> 5.15")
327327
spec.add_development_dependency("minitest-reporters", "~> 1.4")
328+
spec.add_development_dependency("psych", "~> 4.0") # psych 5 isn't building in places yet https://github.com/ruby/setup-ruby/issues/409
328329
spec.add_development_dependency("rake", "~> 13.0")
329330
spec.add_development_dependency("rake-compiler", "= 1.1.7")
330331
spec.add_development_dependency("rake-compiler-dock", "= 1.2.2")

test/xml/sax/test_parser.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ def call_parse_io_with_encoding(encoding)
402402
end
403403

404404
it :test_large_cdata_is_handled do
405-
skip("see #2132 and https://gitlab.gnome.org/GNOME/libxml2/-/issues/200") if Nokogiri.uses_libxml?("<=2.9.10")
405+
skip("see #2132 and https://gitlab.gnome.org/GNOME/libxml2/-/issues/200") if Nokogiri::VersionInfo.instance.libxml2_using_system?
406406

407407
template = <<~EOF
408408
<?xml version="1.0" encoding="UTF-8"?>

0 commit comments

Comments
 (0)