Skip to content

Commit 83f91c7

Browse files
committed
Add 4.0 to test matrix
Fix tests
1 parent 99187f1 commit 83f91c7

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

.github/workflows/test_ruby.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ jobs:
3030
include:
3131
# Test both FFI and Native implementations on the highest and lowest
3232
# Ruby versions for CRuby and JRuby
33-
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: NATIVE }
34-
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: FFI }
35-
- { name: Ruby 3.2, ruby: ruby-3.2.6, continuous-only: true }
36-
- { name: Ruby 3.3, ruby: ruby-3.3.6, continuous-only: true }
37-
- { name: Ruby 3.4, ruby: ruby-3.4.1, ffi: NATIVE }
38-
- { name: Ruby 3.4, ruby: ruby-3.4.1, ffi: FFI }
33+
- { name: Ruby 3.1, ruby: ruby-3.1.7, ffi: NATIVE }
34+
- { name: Ruby 3.1, ruby: ruby-3.1.7, ffi: FFI }
35+
- { name: Ruby 3.2, ruby: ruby-3.2.9, continuous-only: true }
36+
- { name: Ruby 3.3, ruby: ruby-3.3.10, continuous-only: true }
37+
- { name: Ruby 3.4, ruby: ruby-3.4.8, ffi: NATIVE }
38+
- { name: Ruby 3.4, ruby: ruby-3.4.8, ffi: FFI }
39+
- { name: Ruby 4.0, ruby: ruby-4.0.0, ffi: NATIVE }
40+
- { name: Ruby 4.0, ruby: ruby-4.0.0, ffi: FFI }
3941
- { name: JRuby 9.4, ruby: jruby-9.4.9.0, ffi: NATIVE }
4042
- { name: JRuby 9.4, ruby: jruby-9.4.9.0, ffi: FFI }
4143

@@ -143,6 +145,8 @@ jobs:
143145
- { version: "3.3", continuous-only: true }
144146
- { version: "3.4", ffi: NATIVE }
145147
- { version: "3.4", ffi: FFI }
148+
- { version: "4.0", ffi: NATIVE }
149+
- { version: "4.0", ffi: FFI }
146150

147151
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
148152
runs-on: macos-14
@@ -155,7 +159,7 @@ jobs:
155159

156160
- name: Pin Ruby version
157161
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
158-
uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
162+
uses: ruby/setup-ruby@ae195bbe749a7cef685ac729197124a48305c1cb # v1.276.0
159163
with:
160164
ruby-version: ${{ matrix.version }}
161165

@@ -180,12 +184,14 @@ jobs:
180184
include:
181185
# Test both FFI and Native implementations on the highest and lowest
182186
# Ruby versions for CRuby and JRuby.
183-
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: NATIVE }
184-
- { name: Ruby 3.1, ruby: ruby-3.1.6, ffi: FFI }
185-
- { name: Ruby 3.2, ruby: ruby-3.2.6, continuous-only: true}
186-
- { name: Ruby 3.3, ruby: ruby-3.3.6, continuous-only: true}
187-
- { name: Ruby 3.4, ruby: ruby-3.4.1, ffi: NATIVE }
188-
- { name: Ruby 3.4, ruby: ruby-3.4.1, ffi: FFI, continuous-only: true }
187+
- { name: Ruby 3.1, ruby: ruby-3.1.7, ffi: NATIVE }
188+
- { name: Ruby 3.1, ruby: ruby-3.1.7, ffi: FFI }
189+
- { name: Ruby 3.2, ruby: ruby-3.2.9, continuous-only: true}
190+
- { name: Ruby 3.3, ruby: ruby-3.3.10, continuous-only: true}
191+
- { name: Ruby 3.4, ruby: ruby-3.4.8, ffi: NATIVE }
192+
- { name: Ruby 3.4, ruby: ruby-3.4.8, ffi: FFI, continuous-only: true }
193+
- { name: Ruby 4.0, ruby: ruby-4.0.0, ffi: NATIVE }
194+
- { name: Ruby 4.0, ruby: ruby-4.0.0, ffi: FFI, continuous-only: true }
189195
- { name: JRuby 9.4, ruby: jruby-9.4.9.0, ffi: NATIVE }
190196
- { name: JRuby 9.4, ruby: jruby-9.4.9.0, ffi: FFI, continuous-only: true }
191197
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Install ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}

ruby/tests/repeated_field_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ def test_acts_like_an_array
2929
arr_methods -= [:intersect?]
3030
# ruby 3.4 methods we ignore
3131
arr_methods -= [:fetch_values]
32+
# ruby 4.0 methods we ignore
33+
arr_methods -= [:rfind]
34+
3235
arr_methods.each do |method_name|
3336
assert_respond_to m.repeated_string, method_name
3437
end

0 commit comments

Comments
 (0)