Skip to content

Commit 4cd14c4

Browse files
committed
[GR-47779] Use CRuby 3.2.2 in CI and for benchmarking
PullRequest: truffleruby/3953
2 parents 7edbb4f + c94ae18 commit 4cd14c4

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

ci.jsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ local part_definitions = {
313313
"RUBY_SPEC_TEST_ZLIB_CRC_TABLE": "false", # CRuby was built on OL6 and is used on OL7
314314
},
315315
run+: jt(["-u", "ruby", "mspec", "spec/ruby"]) +
316+
jt(["-u", "/cm/shared/apps-ol7/ruby/3.1.2/bin/ruby", "mspec", "spec/ruby"]) +
316317
jt(["-u", "/cm/shared/apps/ruby/3.0.2/bin/ruby", "mspec", "spec/ruby"]),
317318
},
318319

ci/common.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ local common_json = import "../common.json";
213213

214214
truffleruby:: {
215215
packages+: (if self.os == "linux" && self.arch == "amd64" then {
216-
ruby: "==3.1.2", # Newer version, also used for benchmarking
216+
ruby: "==3.2.2", # Newer version, also used for benchmarking
217217
} else {
218218
ruby: "==3.0.2",
219219
}) + (if self.os == "linux" then {

lib/mri/bundler.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ module Bundler
3939
environment_preserver.replace_with_backup
4040
SUDO_MUTEX = Thread::Mutex.new
4141

42-
SAFE_MARSHAL_CLASSES = [Symbol, TrueClass, String, Array, Hash, Gem::Version, Gem::Specification].freeze
42+
# TruffleRuby: FalseClass added because it is necessary for `jt test bundle`, and also done upstream since https://github.com/rubygems/rubygems/pull/6655
43+
SAFE_MARSHAL_CLASSES = [Symbol, TrueClass, FalseClass, String, Array, Hash, Gem::Version, Gem::Specification].freeze
4344
SAFE_MARSHAL_ERROR = "Unexpected class %s present in marshaled data. Only %s are allowed."
4445
SAFE_MARSHAL_PROC = proc do |object|
4546
object.tap do

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"name": "regex",
2222
"subdir": True,
23-
"version": "20b34173b7e15c334d79f0a22ee01889d235748b",
23+
"version": "f363b55797fe85ea6aa24218364b57f3c71aeb56",
2424
"urls": [
2525
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2626
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
2929
{
3030
"name": "sulong",
3131
"subdir": True,
32-
"version": "20b34173b7e15c334d79f0a22ee01889d235748b",
32+
"version": "f363b55797fe85ea6aa24218364b57f3c71aeb56",
3333
"urls": [
3434
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3535
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)