msi: update bundled ruby to 3.2.4

ref. https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ drop already merged patch. See oneclick/rubyinstaller2#375 Signed-off-by: Kentaro Hayashi <[email protected]>
fluent · Jun 19, 2024 · fc2947f · fc2947f
1 parent b883fe2
commit fc2947f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/fluent-package/config.rb b/fluent-package/config.rb
@@ -23,20 +23,19 @@
 BUNDLER_VERSION= "2.3.27"
 
 # https://www.ruby-lang.org/en/downloads/ (tar.gz)
-BUNDLED_RUBY_VERSION = "3.2.3"
-BUNDLED_RUBY_SOURCE_SHA256SUM = "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba"
+BUNDLED_RUBY_VERSION = "3.2.4"
+BUNDLED_RUBY_SOURCE_SHA256SUM = "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692"
 
 BUNDLED_RUBY_PATCHES = [
   # An example entry:
   # ["ruby-3.0/0001-ruby-resolv-Fix-confusion-of-received-response-messa.patch",   ["= 3.0.1"]],
 ]
 
 # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES)
-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.3-1"
-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "cf106d718499125a55dff82daee40e7744ed224694c96036765b84a3ac4f654c"
+BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.4-1"
+BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "20f4c87fea871cadb3286da6c46cd018c12b9d444f0c40b3332b3f2939ce31b9"
 
 # Files under rubyinstaller/ are patches for RubyInstaller's binary package.
 # Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES.
 BUNDLED_RUBY_INSTALLER_PATCHES = [
-  ["rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch", [">= 0"]],
 ]
diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile
@@ -31,7 +31,7 @@ RUN \
   choco install -y git wixtoolset 7zip && \
   choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System' && \
   choco install -y msys2 --params /NoUpdate --version=20230718.0.0 && \
-  choco install ruby -y --version=3.1.3.1 && \
+  choco install ruby -y --version=3.2.4.1 && \
   refreshenv && \
   ridk install 3 && \
   gem install --no-document --force bundler builder
diff --git a/...age/patches/rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch b/...age/patches/rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch