diff --git a/ci.jsonnet b/ci.jsonnet index c7c134a1c049..cde35bf84b0f 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -313,6 +313,7 @@ local part_definitions = { "RUBY_SPEC_TEST_ZLIB_CRC_TABLE": "false", # CRuby was built on OL6 and is used on OL7 }, run+: jt(["-u", "ruby", "mspec", "spec/ruby"]) + + jt(["-u", "/cm/shared/apps-ol7/ruby/3.1.2/bin/ruby", "mspec", "spec/ruby"]) + jt(["-u", "/cm/shared/apps/ruby/3.0.2/bin/ruby", "mspec", "spec/ruby"]), }, diff --git a/ci/common.jsonnet b/ci/common.jsonnet index d804edc5c254..a5bdf79c1acf 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -213,7 +213,7 @@ local common_json = import "../common.json"; truffleruby:: { packages+: (if self.os == "linux" && self.arch == "amd64" then { - ruby: "==3.1.2", # Newer version, also used for benchmarking + ruby: "==3.2.2", # Newer version, also used for benchmarking } else { ruby: "==3.0.2", }) + (if self.os == "linux" then { diff --git a/lib/mri/bundler.rb b/lib/mri/bundler.rb index 88f25b523a41..b970c6ced8c9 100644 --- a/lib/mri/bundler.rb +++ b/lib/mri/bundler.rb @@ -39,7 +39,8 @@ module Bundler environment_preserver.replace_with_backup SUDO_MUTEX = Thread::Mutex.new - SAFE_MARSHAL_CLASSES = [Symbol, TrueClass, String, Array, Hash, Gem::Version, Gem::Specification].freeze + # TruffleRuby: FalseClass added because it is necessary for `jt test bundle`, and also done upstream since https://github.com/rubygems/rubygems/pull/6655 + SAFE_MARSHAL_CLASSES = [Symbol, TrueClass, FalseClass, String, Array, Hash, Gem::Version, Gem::Specification].freeze SAFE_MARSHAL_ERROR = "Unexpected class %s present in marshaled data. Only %s are allowed." SAFE_MARSHAL_PROC = proc do |object| object.tap do diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py index 115f14e52772..a0944d077b2f 100644 --- a/mx.truffleruby/suite.py +++ b/mx.truffleruby/suite.py @@ -20,7 +20,7 @@ { "name": "regex", "subdir": True, - "version": "20b34173b7e15c334d79f0a22ee01889d235748b", + "version": "f363b55797fe85ea6aa24218364b57f3c71aeb56", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"}, @@ -29,7 +29,7 @@ { "name": "sulong", "subdir": True, - "version": "20b34173b7e15c334d79f0a22ee01889d235748b", + "version": "f363b55797fe85ea6aa24218364b57f3c71aeb56", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},