From 3187d6739c90864a7bb59cf8276facb1a47ca85d Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 6 Dec 2022 12:09:08 -0600 Subject: [PATCH 1/2] dep(dev): pin psych to v4 until v5 builds in CI backport of 6a3254c --- nokogiri.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/nokogiri.gemspec b/nokogiri.gemspec index 841ff1fde3..f946d6f0dc 100644 --- a/nokogiri.gemspec +++ b/nokogiri.gemspec @@ -325,6 +325,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency("hoe-markdown", "~> 1.4") spec.add_development_dependency("minitest", "~> 5.15") spec.add_development_dependency("minitest-reporters", "~> 1.4") + spec.add_development_dependency("psych", "~> 4.0") # psych 5 isn't building in places yet https://github.com/ruby/setup-ruby/issues/409 spec.add_development_dependency("rake", "~> 13.0") spec.add_development_dependency("rake-compiler", "= 1.1.7") spec.add_development_dependency("rake-compiler-dock", "= 1.2.2") From 2efa87b49a26d1e961c2a0c143ecf28a67033677 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 6 Dec 2022 12:10:55 -0600 Subject: [PATCH 2/2] test: skip large cdata test on system libxml2 because distros have started backporting the fix[1] from 2.10.3 and as a result we can't easily tell whether to expect errors or not. backport of 0b2e41d [1]: https://gitlab.gnome.org/GNOME/libxml2/-/commit/c846986 --- test/xml/sax/test_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/xml/sax/test_parser.rb b/test/xml/sax/test_parser.rb index dc99d7c023..59403db146 100644 --- a/test/xml/sax/test_parser.rb +++ b/test/xml/sax/test_parser.rb @@ -402,7 +402,7 @@ def call_parse_io_with_encoding(encoding) end it :test_large_cdata_is_handled do - skip("see #2132 and https://gitlab.gnome.org/GNOME/libxml2/-/issues/200") if Nokogiri.uses_libxml?("<=2.9.10") + skip("see #2132 and https://gitlab.gnome.org/GNOME/libxml2/-/issues/200") if Nokogiri::VersionInfo.instance.libxml2_using_system? template = <<~EOF