Skip to content

Commit e595749

Browse files
Reenable FFI tests on CRuby.
PiperOrigin-RevId: 640188804
1 parent d3a0f59 commit e595749

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

.github/workflows/test_ruby.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ jobs:
2020
# Test both FFI and Native implementations on the highest and lowest
2121
# Ruby versions for CRuby and JRuby, but only on Bazel 5.x.
2222
- { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: NATIVE }
23-
# TODO Re-enable these once flakes are fixed
24-
#- { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: FFI }
23+
- { name: Ruby 3.0, ruby: ruby-3.0.2, ffi: FFI }
2524
- { name: Ruby 3.1, ruby: ruby-3.1.0 }
2625
- { name: Ruby 3.2, ruby: ruby-3.2.0 }
2726
- { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: NATIVE }
28-
# TODO Re-enable these once flakes are fixed
29-
#- { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: FFI }
27+
- { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: FFI }
3028
- { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: NATIVE }
3129
- { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: FFI }
3230

@@ -44,6 +42,11 @@ jobs:
4442
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
4543
bazel-cache: ruby_linux/${{ matrix.ruby }}_${{ matrix.bazel }}
4644
bazel: test //ruby/... //ruby/tests:ruby_version --test_env=KOKORO_RUBY_VERSION --test_env=BAZEL=true ${{ matrix.ffi == 'FFI' && '--//ruby:ffi=enabled --test_env=PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION=FFI' || '' }}
45+
- name: Archive log artifacts
46+
uses: actions/upload-artifact@v4
47+
with:
48+
name: test-logs-${{ matrix.ruby }}_${{ matrix.ffi || 'NATIVE' }}
49+
path: logs
4750

4851
linux-32bit:
4952
name: Linux 32-bit
@@ -116,13 +119,11 @@ jobs:
116119
# Ruby versions for CRuby, but only on Bazel 5.x.
117120
# Quote versions numbers otherwise 3.0 will render as 3
118121
- { version: "3.0", ffi: NATIVE }
119-
# TODO Re-enable these once flakes are fixed
120-
#- { version: "3.0", ffi: FFI }
122+
- { version: "3.0", ffi: FFI }
121123
- { version: "3.1" }
122124
- { version: "3.2" }
123125
- { version: "3.3", ffi: NATIVE }
124-
# TODO Re-enable these once flakes are fixed
125-
#- { version: "3.3", ffi: FFI }
126+
- { version: "3.3", ffi: FFI }
126127

127128
name: MacOS Ruby ${{ matrix.version }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
128129
runs-on: macos-12

0 commit comments

Comments
 (0)