Skip to content

Commit 4ccad93

Browse files
committed
Fix CI
* Ruby head is now ruby 4.0 * `ruby_parser`/`sexp_processor` disallow ruby 4.0, bump them * Relax truffleruby/jruby constraint * Bump bundler for ruby-head * disable current ruby test for the `parser` gem * pin rust * run cruby tests against the correct branch
1 parent af9c6aa commit 4ccad93

9 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/cruby-bindings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
with:
2424
repository: ruby/ruby
2525
path: ruby/ruby
26+
ref: ruby_3_4
2627
fetch-depth: 1
2728
- name: Install libraries
2829
run: |

.github/workflows/rust-bindings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Rust
3434
uses: dtolnay/rust-toolchain@master
3535
with:
36-
toolchain: stable
36+
toolchain: "1.91.1"
3737
targets: wasm32-wasip1
3838
- uses: actions/cache@v4
3939
with:
@@ -67,7 +67,7 @@ jobs:
6767
- name: Set up Rust
6868
uses: dtolnay/rust-toolchain@master
6969
with:
70-
toolchain: stable
70+
toolchain: "1.91.1"
7171
components: clippy, rustfmt
7272
- uses: actions/cache@v4
7373
with:

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ GEM
3333
tsort
3434
ruby_memcheck (3.0.1)
3535
nokogiri
36-
ruby_parser (3.21.1)
36+
ruby_parser (3.22.0)
3737
racc (~> 1.5)
3838
sexp_processor (~> 4.16)
39-
sexp_processor (4.17.4)
39+
sexp_processor (4.17.5)
4040
stringio (3.1.7)
4141
test-unit (3.7.0)
4242
power_assert
@@ -59,4 +59,4 @@ DEPENDENCIES
5959
test-unit
6060

6161
BUNDLED WITH
62-
2.5.16
62+
4.0.14

gemfiles/3.5/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "~> 3.5.0.dev"
5+
ruby ">= 3.5.0.dev"
66

77
gemspec path: "../.."
88

gemfiles/3.5/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ GEM
2626
logger
2727
ruby_memcheck (3.0.1)
2828
nokogiri
29-
ruby_parser (3.21.1)
29+
ruby_parser (3.22.0)
3030
racc (~> 1.5)
3131
sexp_processor (~> 4.16)
32-
sexp_processor (4.17.4)
32+
sexp_processor (4.17.5)
3333
test-unit (3.7.0)
3434
power_assert
3535

gemfiles/jruby/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "~> 3.4.2", engine: "jruby", engine_version: "~> 10.0.0"
5+
ruby ">= 3.4.2", engine: "jruby", engine_version: ">= 10.0.0"
66

77
gemspec path: "../.."
88

gemfiles/truffleruby/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "~> 3.3.7", engine: "truffleruby", engine_version: "~> 25.0.0"
5+
ruby ">= 3.3.7", engine: "truffleruby", engine_version: ">= 25.0.0"
66

77
gemspec path: "../.."
88

rust/ruby-prism/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ fn struct_name(name: &str) -> String {
142142
result
143143
}
144144

145-
fn kind_to_type(kind: &String) -> String {
146-
match kind.as_str() {
145+
fn kind_to_type(kind: &str) -> String {
146+
match kind {
147147
"non-void expression" | "pattern expression" | "Node" => String::new(),
148-
_ => kind.to_string(),
148+
_ => kind.to_owned(),
149149
}
150150
}
151151

test/prism/ruby/parser_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def test_non_prism_builder_class_deprecated
163163
assert_empty(warnings)
164164
end
165165

166-
if RUBY_VERSION >= "3.3"
166+
if RUBY_VERSION >= "3.3" && RUBY_VERSION < "4.0"
167167
def test_current_parser_for_current_ruby
168168
major, minor, _patch = Gem::Version.new(RUBY_VERSION).segments
169169
# Let's just hope there never is a Ruby 3.10 or similar

0 commit comments

Comments
 (0)