Skip to content

Commit f6bd129

Browse files
committed
[GR-26781] [GR-27519] Use MRI 2.7.2 in CI.
PullRequest: truffleruby/2173
2 parents 2cfd347 + bbdc14f commit f6bd129

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

ci.jsonnet

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ local common = (import "common.json");
3030
local part_definitions = {
3131
local jt = function(args) [["ruby", "tool/jt.rb"] + args],
3232
local mri_path = function(version) "/cm/shared/apps/ruby/" + version + "/bin/ruby",
33-
local mri_version = "2.6.5",
33+
local mri_version = "2.7.2",
3434

3535
use: {
3636
common: {
@@ -221,7 +221,6 @@ local part_definitions = {
221221
packages+: {
222222
git: ">=1.8.3",
223223
mercurial: ">=3.2.4",
224-
ruby: ">=" + mri_version,
225224
binutils: ">=2.30",
226225
},
227226
},
@@ -230,6 +229,9 @@ local part_definitions = {
230229
platform_name:: "LinuxAMD64",
231230
platform: "linux",
232231
arch:: "amd64",
232+
packages+: {
233+
ruby: ">=" + mri_version,
234+
},
233235
"$.cap":: {
234236
normal_machine: ["linux", "amd64"],
235237
bench_machine: ["x52"] + self.normal_machine + ["no_frequency_scaling"],
@@ -239,6 +241,9 @@ local part_definitions = {
239241
platform_name:: "LinuxARM64",
240242
platform: "linux",
241243
arch:: "aarch64",
244+
packages+: {
245+
ruby: ">=2.6",
246+
},
242247
"$.cap":: {
243248
normal_machine: ["linux", "aarch64"],
244249
},

doc/contributor/updating-ruby-installers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ There is a handy script in the repo that does everything needed:
2929

3030
```bash
3131
./update.sh truffleruby $VERSION
32-
./update.sh graalvm $VERSION
32+
./update.sh truffleruby-graalvm $VERSION
3333
```
3434

3535
## ruby-build

spec/ruby/default.mspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ class MSpecScript
4545
set :toplevel_constants_excludes, [
4646
/\wSpecs?$/,
4747
/^CS_CONST/,
48+
/^CSL_CONST/,
4849
]
4950
end

0 commit comments

Comments
 (0)