Skip to content

Commit 3a59f5b

Browse files
committed
Update the :ruby25 job
1 parent b557660 commit 3a59f5b

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

ci.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ local part_definitions = {
386386
run+: [
387387
["mx", "unittest", "org.truffleruby"],
388388
["mx", "tck"],
389-
] + jt(["test", "specs"] + self["$.run.specs"].test_spec_options) +
390-
jt(["test", "specs", ":ruby25"]),
389+
] + jt(["test", "specs"] + self["$.run.specs"].test_spec_options),
390+
# + jt(["test", "specs", ":next"]) disabled as it's currently empty and MSpec doesn't support empty sets of files
391391
},
392392

393393
test_fast: {

doc/contributor/workflow.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,9 @@ $ PRETEND_RUBY_VERSION=2.5.0 jt test spec/ruby/core/integer/digits_spec.rb
191191

192192
This also works for `jt tag`/`jt untag`.
193193

194-
When working on a 2.4/2.5 feature, add the spec file in the corresponding file
195-
list (`:ruby25`) in `spec/truffle.mspec` so that the specs are run in CI too.
194+
When working on a feature from the next version of Ruby, add the spec file in
195+
the corresponding file list (`:next`) in `spec/truffle.mspec` so that the
196+
specs are run in CI too.
196197

197198
## How to fix a failing MRI test
198199

spec/truffle.mspec

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,7 @@ class MSpecScript
9393
"spec/truffle/capi"
9494
]
9595

96-
set :ruby25, [
97-
"spec/ruby/core/kernel/yield_self_spec.rb",
98-
"spec/ruby/core/method/case_compare_spec.rb",
99-
"spec/ruby/core/enumerable/all_spec.rb",
100-
"spec/ruby/core/enumerable/any_spec.rb",
101-
"spec/ruby/core/enumerable/none_spec.rb",
102-
"spec/ruby/core/enumerable/one_spec.rb",
103-
"spec/ruby/core/exception/full_message_spec.rb",
104-
"spec/ruby/core/hash/transform_keys_spec.rb",
105-
"spec/ruby/library/mathn/mathn_spec.rb",
96+
set :next, [
10697
]
10798

10899
set :backtrace_filter, /mspec\//
@@ -147,15 +138,15 @@ class MSpecScript
147138
set :files, get(:command_line) + get(:language) + get(:core) + get(:library) + get(:truffle) + get(:security)
148139

149140
# All specs, including specs needing C-extensions support.
150-
# 2.4/2.5 specs are not included as they need to run in a separate process.
141+
# Next version specs are not included as they need to run in a separate process.
151142
set :all, get(:files) + get(:capi) + get(:truffle_capi) + get(:library_cext)
152143
end
153144

154145
if MSpecScript.child_process?
155146
if version = ENV["PRETEND_RUBY_VERSION"]
156147
::VersionGuard::FULL_RUBY_VERSION = SpecVersion.new(version)
157-
elsif ARGV.include? ":ruby25"
158-
::VersionGuard::FULL_RUBY_VERSION = SpecVersion.new("2.5.3")
148+
elsif ARGV.include? ":next"
149+
::VersionGuard::FULL_RUBY_VERSION = SpecVersion.new("2.7.0")
159150
end
160151

161152
# We do not use Ruby 2.5's FrozenError yet

0 commit comments

Comments
 (0)