From f0a4994da61228dddf09c306c6147c97f65a8ad3 Mon Sep 17 00:00:00 2001 From: Nik08 Date: Mon, 6 May 2024 17:56:46 +0530 Subject: [PATCH 1/2] Updated ruby version list with 3.3.0 & 3.3.1 Signed-off-by: Nik08 --- config/software/ruby.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/software/ruby.rb b/config/software/ruby.rb index 589c3409e..8c470dda5 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -42,6 +42,8 @@ dependency "ncurses" if freebsd? # version_list: url=https://cache.ruby-lang.org/pub/ruby/ filter=*.tar.gz +version("3.3.1") { source sha256: "8dc2af2802cc700cd182d5430726388ccf885b3f0a14fcd6a0f21ff249c9aa99" } +version("3.3.0") { source sha256: "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d" } version("3.2.2") { source sha256: "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc" } version("3.2.0") { source sha256: "daaa78e1360b2783f98deeceb677ad900f3a36c0ffa6e2b6b19090be77abc272" } version("3.1.5") { source sha256: "3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5" } From 31da10b2a3b64d38b001cff0ceac7327258fb667 Mon Sep 17 00:00:00 2001 From: Nik08 Date: Mon, 6 May 2024 17:57:36 +0530 Subject: [PATCH 2/2] Updated ruby-mysys2-devkit versions for Ruby 3.3 Signed-off-by: Nik08 --- config/software/ruby-msys2-devkit.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/config/software/ruby-msys2-devkit.rb b/config/software/ruby-msys2-devkit.rb index 1b66e0c55..cb1544c64 100644 --- a/config/software/ruby-msys2-devkit.rb +++ b/config/software/ruby-msys2-devkit.rb @@ -51,6 +51,20 @@ authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}" end +version "3.3.0-1" do + source url: "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-#{version}/rubyinstaller-devkit-#{version}-x64.exe", + sha256: "01fc7d7889f161e94ae515c15fc1c22b7db506ab91af891cf7e1a764e96d8298" + internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/rubyinstaller-devkit-#{version}-x64.exe", + authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}" +end + +version "3.3.1-1" do + source url: "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-#{version}/rubyinstaller-devkit-#{version}-x64.exe", + sha256: "dc590fb3d1c4254e7d33179bb84df378ead943fece2159eada5f3582bf643cc3" + internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/rubyinstaller-devkit-#{version}-x64.exe", + authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}" +end + build do if windows? embedded_dir = "#{install_dir}/embedded" @@ -73,6 +87,11 @@ copy "#{tmpdir}/lib/ruby/site_ruby/3.2.0/ruby_installer.rb", "#{embedded_dir}/lib/ruby/site_ruby/3.2.0" copy "#{tmpdir}/lib/ruby/site_ruby/3.2.0/ruby_installer", "#{embedded_dir}/lib/ruby/site_ruby/3.2.0" copy "#{tmpdir}/lib/ruby/3.2.0/rubygems/defaults", "#{embedded_dir}/lib/ruby/3.2.0/rubygems/defaults" + elsif version.start_with?("3.3") + copy "#{tmpdir}/lib/ruby/site_ruby/3.3.0/devkit.rb", "#{embedded_dir}/lib/ruby/site_ruby/3.3.0" + copy "#{tmpdir}/lib/ruby/site_ruby/3.3.0/ruby_installer.rb", "#{embedded_dir}/lib/ruby/site_ruby/3.3.0" + copy "#{tmpdir}/lib/ruby/site_ruby/3.3.0/ruby_installer", "#{embedded_dir}/lib/ruby/site_ruby/3.3.0" + copy "#{tmpdir}/lib/ruby/3.3.0/rubygems/defaults", "#{embedded_dir}/lib/ruby/3.3.0/rubygems/defaults" end # Normally we would symlink the required unix tools.