Skip to content

Commit

Permalink
[GR-47779] Use CRuby 3.2.2 in CI and for benchmarking
Browse files Browse the repository at this point in the history
PullRequest: truffleruby/3953
  • Loading branch information
eregon committed Dec 1, 2023
2 parents 7edbb4f + c94ae18 commit 4cd14c4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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"]),
},

Expand Down
2 changes: 1 addition & 1 deletion ci/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion lib/mri/bundler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions mx.truffleruby/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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"},
Expand Down

0 comments on commit 4cd14c4

Please sign in to comment.