Skip to content

Commit 1c6c9bf

Browse files
committed
* jruby/truffle upgrades
1 parent ea03f4c commit 1c6c9bf

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.github/workflows/jruby-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: ruby/setup-ruby@v1
2222
with:
23-
ruby-version: 3.3
23+
ruby-version: 3.4
2424
bundler-cache: true
2525
- name: Make sure .rbnext dir is present
2626
run: |

.github/workflows/ruby-edge-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919
- uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: head
21+
ruby-version: 3.5
2222
bundler-cache: true
2323
- name: Run MSpec
2424
run: |

.github/workflows/truffle-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: ruby/setup-ruby@v1
2222
with:
23-
ruby-version: 3.3
23+
ruby-version: 3.4
2424
bundler-cache: true
2525
- name: Make sure .rbnext dir is present
2626
run: |

spec/language/it_param_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
it "do not overwrite already defined local variable" do
2121
# FIXME: We do not support shadowing, 'cause it doesn't play well with Prism
22-
next skip unless RUBY_VERSION >= "3.4.0"
22+
# JRuby doesn't support it yet, but claims RUBY_VERSION ~> 3.4
23+
next skip unless (RUBY_VERSION >= "3.4.0" && !defined?(JRUBY_VERSION))
2324
it = 42
2425
proc { it }.call("a").should == 42
2526
end
@@ -29,6 +30,7 @@
2930
end
3031

3132
it "raises SyntaxError when block parameters are specified explicitly" do
33+
next skip unless (RUBY_VERSION >= "3.4.0" && !defined?(JRUBY_VERSION))
3234
-> { eval("-> () { it }") }.should raise_error(SyntaxError, /ordinary parameter is defined/)
3335
-> { eval("-> (x) { it }") }.should raise_error(SyntaxError, /ordinary parameter is defined/)
3436

spec/test_unit_to_mspec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def eval(source, bind = nil, *other)
9696
refine Kernel do
9797
# TrufflyRuby doesn't support super in imported methods:
9898
# https://github.com/oracle/truffleruby/issues/2971
99-
if RUBY_VERSION >= "3.1.0" && !defined?(TruffleRuby)
99+
if RUBY_VERSION >= "3.1.0"
100100
import_methods TestUnitToMspec::KernelExt
101101
else
102102
include TestUnitToMspec::KernelExt

0 commit comments

Comments
 (0)