drop 2.7 in linux test (#17524)
* drop 2.7 in linux test
* update jruby 9.4.6.0
* macos 11 to 12
diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml
index 726e0aa..ff97a47 100644
--- a/.github/workflows/test_ruby.yml
+++ b/.github/workflows/test_ruby.yml
@@ -19,17 +19,14 @@
include:
# Test both FFI and Native implementations on the highest and lowest
# Ruby versions for CRuby and JRuby, but only on Bazel 5.x.
- - { name: Ruby 2.7, ruby: ruby-2.7.0, ffi: NATIVE }
- # TODO Re-enable these once flakes are fixed
- #- { name: Ruby 2.7, ruby: ruby-2.7.0, ffi: FFI }
- { name: Ruby 3.0, ruby: ruby-3.0.2 }
- { name: Ruby 3.1, ruby: ruby-3.1.0 }
- { name: Ruby 3.2, ruby: ruby-3.2.0, ffi: NATIVE }
- { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: NATIVE }
# TODO Re-enable these once flakes are fixed
#- { name: Ruby 3.2, ruby: ruby-3.2.0, ffi: FFI }
- - { name: JRuby 9.4, ruby: jruby-9.4.3.0, ffi: NATIVE }
- - { name: JRuby 9.4, ruby: jruby-9.4.3.0, ffi: FFI }
+ - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: NATIVE }
+ - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: FFI }
name: Linux ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
runs-on: ubuntu-latest
@@ -41,7 +38,7 @@
- name: Run tests
uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-6.3.0-904cad5249547845454998ca3837a34c71fabf96', matrix.ruby) }}
+ image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-6.3.0-384d5abe83a791c6b1ce04f5d7bc0b1f84a30d38', matrix.ruby) }}
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: ruby_linux/${{ matrix.ruby }}_${{ matrix.bazel }}
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' || '' }}
diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml
index 27f909a..37b2edc 100644
--- a/.github/workflows/test_upb.yml
+++ b/.github/workflows/test_upb.yml
@@ -169,13 +169,13 @@
# supported Python versions and assume this gives us sufficient test
# coverage.
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'binary' }
- - { os: macos-11, python-version: "3.8", architecture: x64, type: 'binary' }
+ - { os: macos-12, python-version: "3.8", architecture: x64, type: 'binary' }
- { os: ubuntu-latest, python-version: "3.11", architecture: x64, type: 'binary' }
- - { os: macos-11, python-version: "3.11", architecture: x64, type: 'binary' }
+ - { os: macos-12, python-version: "3.11", architecture: x64, type: 'binary' }
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source' }
- - { os: macos-11, python-version: "3.8", architecture: x64, type: 'source' }
+ - { os: macos-12, python-version: "3.8", architecture: x64, type: 'source' }
- { os: ubuntu-latest, python-version: "3.11", architecture: x64, type: 'source' }
- - { os: macos-11, python-version: "3.11", architecture: x64, type: 'source' }
+ - { os: macos-12, python-version: "3.11", architecture: x64, type: 'source' }
# Windows uses the full API up until Python 3.10, so each of these
# jobs tests a distinct binary wheel.
