From e7de624a907303df2e144cc3ad762c854dcbe534 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 1 Aug 2026 11:22:24 +0200 Subject: [PATCH] Adapt to the layout of Ruby v4 After https://github.com/msys2/MINGW-packages/pull/30629 (i.e. upgrading from Ruby v3 to Ruby v4), git-sdk-32's `git-artifacts` workflow fails, https://github.com/git-for-windows/git-sdk-32/actions/runs/30686704279/job/91333841888#step:9:410 ASCIIDOC ToolsForGit.html D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/4.0.0/cgi/util.rb:3:in 'Kernel#require': cannot load such file -- cgi/escape (LoadError) Did you mean? cgi/util from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/4.0.0/cgi/util.rb:3:in '' from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/gems/4.0.0/gems/asciidoctor-2.0.26/lib/asciidoctor.rb:9:in 'Kernel#require' from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/gems/4.0.0/gems/asciidoctor-2.0.26/lib/asciidoctor.rb:9:in '' from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/gems/4.0.0/gems/asciidoctor-2.0.26/bin/asciidoctor:6:in 'Kernel#require' from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/gems/4.0.0/gems/asciidoctor-2.0.26/bin/asciidoctor:6:in '' from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/4.0.0/rubygems.rb:305:in 'Kernel#load' from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/lib/ruby/4.0.0/rubygems.rb:305:in 'Gem.activate_and_load_bin_path' from D:/a/git-sdk-32/git-sdk-32/build-installers/mingw32/bin/asciidoctor:36:in '
' make[1]: *** [Makefile:396: ToolsForGit.html] Error 1 The reason is a changed file layout of Ruby's gems. Let's adapt to that. Signed-off-by: Johannes Schindelin --- .sparse/makepkg-git | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.sparse/makepkg-git b/.sparse/makepkg-git index ab18e799ff9..aebb890cc9b 100644 --- a/.sparse/makepkg-git +++ b/.sparse/makepkg-git @@ -76,7 +76,7 @@ /mingw32/lib/ruby/gems/*/specifications/asciidoctor-*.gemspec /mingw32/lib/ruby/*/tsort.rb /mingw32/lib/ruby/*/set.rb -/mingw32/lib/ruby/*/logger.rb +/mingw32/lib/ruby/**/*/logger* /mingw32/lib/ruby/*/i386-mingw32/enc/encdb.so /mingw32/lib/ruby/*/i386-mingw32/enc/windows_1252.so /mingw32/lib/ruby/*/optparse.rb @@ -85,8 +85,7 @@ /mingw32/lib/ruby/*/pathname.rb /mingw32/lib/ruby/*/i386-mingw32/pathname.so /mingw32/lib/ruby/*/did_you_mean* -/mingw32/lib/ruby/*/cgi/util* -/mingw32/lib/ruby/*/logger* +/mingw32/lib/ruby/*/cgi/* /mingw32/lib/ruby/*/bundled_gems.rb /mingw32/lib/ruby/*/syntax_suggest*