Skip to content

Commit e28a849

Browse files
committed
[GR-16686] Use the package-managed version of MRI for benchmarks.
PullRequest: truffleruby/933
2 parents 61ef6f4 + 156175c commit e28a849

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

ci.jsonnet

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ local utils = import "utils.libsonnet";
2727
# where build is defined, there are no other objects in the middle.
2828
local part_definitions = {
2929
local jt = function(args) [["ruby", "tool/jt.rb"] + args],
30+
local mri_version = "2.6.3",
3031

3132
use: {
3233
common: {
@@ -101,17 +102,14 @@ local part_definitions = {
101102

102103
mri: {
103104
"$.benchmark.server":: { options: ["--", "--no-core-load-path"] },
104-
downloads+: {
105-
MRI_HOME: { name: "ruby", version: "2.6.3" },
106-
},
107105

108106
environment+: {
109107
HOST_VM: "mri",
110108
HOST_VM_CONFIG: "default",
111109
GUEST_VM: "mri",
112110
GUEST_VM_CONFIG: "default",
113-
RUBY_BIN: "$MRI_HOME/bin/ruby",
114-
JT_BENCHMARK_RUBY: "$MRI_HOME/bin/ruby",
111+
RUBY_BIN: "/cm/shared/apps/ruby/" + mri_version + "/bin/ruby",
112+
JT_BENCHMARK_RUBY: "/cm/shared/apps/ruby/" + mri_version + "/bin/ruby",
115113
},
116114
},
117115

@@ -300,7 +298,7 @@ local part_definitions = {
300298
packages+: {
301299
git: ">=1.8.3",
302300
mercurial: ">=3.2.4",
303-
ruby: ">=2.1.0",
301+
ruby: "==" + mri_version,
304302
llvm: "==3.8",
305303
binutils: ">=2.30",
306304
},

0 commit comments

Comments
 (0)