Drop support for Bazel 5.
This moves all our CI to Bazel 6 and drops the additional parameterization we had on Bazel version.
PiperOrigin-RevId: 551986376
diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index ad2a5e3..ed90e97 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -26,20 +26,16 @@
- { name: No-RTTI, flags: --cxxopt=-fno-rtti }
include:
# Set defaults
- - image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:309dae3122031447d714414814d262e5f31cb93c0e248e9c02f9d8cdafd7e3b9
+ - image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:04cd765285bc52cbbf51d66c8c66d8603579cf0f19cc42df26b09d2c270541fb
- targets: //pkg/... //src/... @com_google_protobuf_examples//...
# Override cases with custom images
- config: { name: "TCMalloc" }
- image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:4df3b4749e787ba0a671ec0b783d0f1ba05f60be4c9e9fd72c875550a0cde1ea"
+ image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:e4493c58e7c3f3a0775e0b19a46bc822e866a5275b7a5463f509af8072f283db"
targets: "//src/..."
- config: { name: "aarch64" }
targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test"
- image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-3af05275178e16af30961976af126eabbbb2c733"
- # TODO(b/278116805) Enable this once Bazel 6 is supported.
- #- config: { name: "Bazel6" }
- # targets: "//src/..."
- # image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.0.0-6361b3a6e5c97e9951d03a4de28542fc45f1adab"
+ image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-222e7e87028b7098e088f5ca7cae06d32f483eb5"
name: Linux ${{ matrix.config.name }}
runs-on: ubuntu-latest
steps:
@@ -48,7 +44,7 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
image: ${{ matrix.image }}
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -68,9 +64,9 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:${{ matrix.version }}-5.4.0-2d15d9e888c9e7f90961dbd3afc8ea209717fb4b
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:${{ matrix.version }}-6.3.0-518b4fcd8d0ded2484c94f02e835526cacfdac2d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: cpp_linux/gcc-${{ matrix.version }}
bazel: test //pkg/... //src/... @com_google_protobuf_examples//...
@@ -90,19 +86,19 @@
submodules: recursive
- name: Cross compile protoc for ${{ matrix.arch }}
id: cross-compile
- uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
+ uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
+ image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-${{ matrix.arch }}
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: linux-release-${{ matrix.arch }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:${{ matrix.arch }}-3af05275178e16af30961976af126eabbbb2c733
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:${{ matrix.arch }}-222e7e87028b7098e088f5ca7cae06d32f483eb5
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
entrypoint: bash
command: >
@@ -137,12 +133,12 @@
ref: ${{ inputs.safe-checkout }}
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: linux-cmake-${{ matrix.name }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-e6272cdfe97c6df307e17b83f3a7a70844f6fc08
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -162,12 +158,12 @@
submodules: recursive
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: linux-cmake-install
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -191,12 +187,12 @@
ref: ${{ inputs.safe-checkout }}
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: linux-cmake-examples
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -231,14 +227,14 @@
submodules: recursive
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: linux-cmake-gcc-${{ matrix.name }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:12.2-5.4.0-307caa02808127e49720f3e77d6a9f3b3ef5a915
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:12.2-6.3.0-518b4fcd8d0ded2484c94f02e835526cacfdac2d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
entrypoint: bash
command: >-
@@ -261,12 +257,12 @@
submodules: recursive
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: linux-cmake-${{ matrix.name }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -285,12 +281,12 @@
submodules: recursive
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: linux-cmake-32-bit
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:f99f051daa8b12f4ebad5927f389bc71372f771ab080290ab451cbaf1648f9ea
platform: linux/386
@@ -331,7 +327,7 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel@v1
+ uses: protocolbuffers/protobuf-ci/bazel@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel: ${{ matrix.bazel }}
@@ -386,7 +382,7 @@
submodules: recursive
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: ${{ matrix.name }}
vsversion: ${{ matrix.vsversion }}
@@ -394,7 +390,7 @@
# Install phase.
- name: Configure CMake for install
if: matrix.install-flags
- uses: protocolbuffers/protobuf-ci/bash@v1
+ uses: protocolbuffers/protobuf-ci/bash@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
command: cmake . ${{ matrix.install-flags }} ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -416,7 +412,7 @@
run: cmake --build . --target clean && rm CMakeCache.txt
- name: Configure CMake
- uses: protocolbuffers/protobuf-ci/bash@v1
+ uses: protocolbuffers/protobuf-ci/bash@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
command: cmake . ${{ matrix.flags }} ${{ env.CCACHE_CMAKE_FLAGS }}
diff --git a/.github/workflows/test_csharp.yml b/.github/workflows/test_csharp.yml
index f0cafc3..21c1aeb 100644
--- a/.github/workflows/test_csharp.yml
+++ b/.github/workflows/test_csharp.yml
@@ -21,9 +21,9 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:3.1.415-6.0.100-508417e5215994ade7585d28ba3aad681a25fa5d
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:3.1.415-6.0.100-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: csharp_linux
bazel: test //csharp/... --action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 --test_env=DOTNET_CLI_HOME=/home/bazel
@@ -60,7 +60,7 @@
- name: Build protobuf C# tests under x86_64 docker image
# Tests are built "dotnet publish" because we want all the dependencies to the copied to the destination directory
# (we want to avoid references to ~/.nuget that won't be available in the subsequent docker run)
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -77,7 +77,7 @@
# running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
# otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
# we just run map the user's home to a throwaway temporary directory
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim-arm64v8
skip-staleness-check: true
diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
index 89c487f..a23abb3 100644
--- a/.github/workflows/test_java.yml
+++ b/.github/workflows/test_java.yml
@@ -19,19 +19,19 @@
include:
- name: OpenJDK 8
version: '8'
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-03a376b5d6ef66f827fc307716e3b841cc26b709
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
targets: //java/... //java/internal:java_version
- name: OpenJDK 11
version: '11'
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-03a376b5d6ef66f827fc307716e3b841cc26b709
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
targets: //java/... //java/internal:java_version
- name: OpenJDK 17
version: '17'
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-03a376b5d6ef66f827fc307716e3b841cc26b709
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
targets: //java/... //java/internal:java_version
- name: aarch64
version: 'aarch64'
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-3af05275178e16af30961976af126eabbbb2c733
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-222e7e87028b7098e088f5ca7cae06d32f483eb5
targets: //java/... //src/google/protobuf/compiler:protoc_aarch64_test
name: Linux ${{ matrix.name }}
@@ -42,7 +42,7 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
image: ${{ matrix.image }}
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -58,9 +58,9 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run Linkage Monitor test
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-03a376b5d6ef66f827fc307716e3b841cc26b709
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: java_linux/8
bazel: test --test_output=all //java:linkage_monitor --spawn_strategy=standalone
@@ -75,9 +75,9 @@
ref: ${{ inputs.safe-checkout }}
- name: Build protoc
id: build-protoc
- uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
+ uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
+ image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-x86_64
- name: Move protoc into place and clean up
@@ -89,9 +89,9 @@
mvn -e -B -Dhttps.protocols=TLSv1.2 install -Dmaven.test.skip=true
working-directory: java
- name: Generate pom.xml files from the template
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-03a376b5d6ef66f827fc307716e3b841cc26b709
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: java_linux/11
# protobuf-java and protobuf-java-util are the member of the BOM
diff --git a/.github/workflows/test_objectivec.yml b/.github/workflows/test_objectivec.yml
index c3c04e9..ae19ec6 100644
--- a/.github/workflows/test_objectivec.yml
+++ b/.github/workflows/test_objectivec.yml
@@ -39,13 +39,13 @@
ref: ${{ inputs.safe-checkout }}
- name: Setup ccache
- uses: protocolbuffers/protobuf-ci/ccache@v1
+ uses: protocolbuffers/protobuf-ci/ccache@v2
with:
cache-prefix: objectivec_${{ matrix.platform }}_${{ matrix.xc_config }}
support-modules: true
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bash@v1
+ uses: protocolbuffers/protobuf-ci/bash@v2
env:
CC: ${{ github.workspace }}/ci/clang_wrapper
CXX: ${{ github.workspace }}/ci/clang_wrapper++
@@ -81,7 +81,7 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Pod lib lint
- uses: protocolbuffers/protobuf-ci/bash@v1
+ uses: protocolbuffers/protobuf-ci/bash@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
command: |
@@ -122,7 +122,7 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: bazel ${{ matrix.config.bazel_action }}
- uses: protocolbuffers/protobuf-ci/bazel@v1
+ uses: protocolbuffers/protobuf-ci/bazel@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel: ${{ matrix.config.bazel_action }} ${{ matrix.config.flags }} ${{ matrix.bazel_targets }}
diff --git a/.github/workflows/test_php.yml b/.github/workflows/test_php.yml
index 2da2f4f..e61db63 100644
--- a/.github/workflows/test_php.yml
+++ b/.github/workflows/test_php.yml
@@ -44,14 +44,14 @@
ref: ${{ inputs.safe-checkout }}
submodules: recursive
- name: Setup composer
- uses: protocolbuffers/protobuf-ci/composer-setup@v1
+ uses: protocolbuffers/protobuf-ci/composer-setup@v2
with:
cache-prefix: php-${{ matrix.version-short }}
directory: php
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:${{ matrix.version }}-508417e5215994ade7585d28ba3aad681a25fa5d
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:${{ matrix.version }}-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
extra-flags: -e COMPOSER_HOME=/workspace/composer-cache
command: ${{ matrix.command }}
@@ -85,20 +85,20 @@
- name: Cross compile protoc for i386
id: cross-compile
- uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
+ uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
+ image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-i386
- name: Setup composer
- uses: protocolbuffers/protobuf-ci/composer-setup@v1
+ uses: protocolbuffers/protobuf-ci/composer-setup@v2
with:
cache-prefix: php-${{ matrix.version }}
directory: php
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: ${{ env.image }}
skip-staleness-check: true
@@ -123,20 +123,20 @@
- name: Cross compile protoc for aarch64
id: cross-compile
- uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
+ uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
+ image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-aarch64
- name: Setup composer
- uses: protocolbuffers/protobuf-ci/composer-setup@v1
+ uses: protocolbuffers/protobuf-ci/composer-setup@v2
with:
cache-prefix: php-8.0
directory: php
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php-aarch64:0cc100b6e03d14c1e8f71ae794dc162ed122fe31@sha256:77b70feba68dced1f0fd21b52a08d3d2e0c5c797bfe68435a0038ce87ecfd310
platform: linux/arm64
@@ -180,13 +180,13 @@
run: php --version | grep ${{ matrix.version }} || (echo "Invalid PHP version - $(php --version)" && exit 1)
- name: Setup composer
- uses: protocolbuffers/protobuf-ci/composer-setup@v1
+ uses: protocolbuffers/protobuf-ci/composer-setup@v2
with:
cache-prefix: php-${{ matrix.version }}
directory: php
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel@v1
+ uses: protocolbuffers/protobuf-ci/bazel@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: php_macos/${{ matrix.version }}
@@ -199,7 +199,7 @@
popd
- name: Run conformance tests
- uses: protocolbuffers/protobuf-ci/bazel@v1
+ uses: protocolbuffers/protobuf-ci/bazel@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: php_macos/${{ matrix.version }}
diff --git a/.github/workflows/test_php_ext.yml b/.github/workflows/test_php_ext.yml
index 1c3f3bb..d922859 100644
--- a/.github/workflows/test_php_ext.yml
+++ b/.github/workflows/test_php_ext.yml
@@ -22,7 +22,7 @@
ref: ${{ inputs.safe-checkout }}
- name: Package extension
- uses: protocolbuffers/protobuf-ci/bazel@v1
+ uses: protocolbuffers/protobuf-ci/bazel@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: php_ext/${{ matrix.version }}
diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml
index f82aa46..49c1063 100644
--- a/.github/workflows/test_python.yml
+++ b/.github/workflows/test_python.yml
@@ -30,7 +30,7 @@
targets: //python/... //python:aarch64_test
# TODO(b/262628111) Enable this once conformance tests are fixed.
flags: --define=use_fast_cpp_protos=true --test_tag_filters=-conformance
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-3af05275178e16af30961976af126eabbbb2c733
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-222e7e87028b7098e088f5ca7cae06d32f483eb5
name: Linux ${{ matrix.type }} ${{ matrix.version }}
runs-on: ubuntu-latest
@@ -40,9 +40,9 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:{0}-508417e5215994ade7585d28ba3aad681a25fa5d', matrix.version) }}
+ image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:{0}-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea', matrix.version) }}
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }}
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} --test_env=KOKORO_PYTHON_VERSION
@@ -85,7 +85,7 @@
source venv/bin/activate
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel@v1
+ uses: protocolbuffers/protobuf-ci/bazel@v2
env:
KOKORO_PYTHON_VERSION: ${{ matrix.version }}
with:
diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml
index 045eedf..6b6e8cc 100644
--- a/.github/workflows/test_ruby.yml
+++ b/.github/workflows/test_ruby.yml
@@ -19,16 +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, bazel: 5.1.1, ffi: NATIVE}
- - { name: Ruby 2.7, ruby: ruby-2.7.0, bazel: 5.1.1, ffi: FFI}
- - { name: Ruby 3.0, ruby: ruby-3.0.2, bazel: 5.1.1}
- - { name: Ruby 3.1, ruby: ruby-3.1.0, bazel: 5.1.1}
- - { name: Ruby 3.2, ruby: ruby-3.2.0, bazel: 5.1.1, ffi: NATIVE}
- - { name: Ruby 3.2, ruby: ruby-3.2.0, bazel: 5.1.1, ffi: FFI}
- - { name: JRuby 9.4, ruby: jruby-9.4.3.0, bazel: 5.1.1, ffi: NATIVE}
- - { name: JRuby 9.4, ruby: jruby-9.4.3.0, bazel: 5.1.1, ffi: FFI}
- - { name: Ruby 2.7 (Bazel6), ruby: ruby-2.7.0, bazel: 6.0.0}
- - { name: JRuby 9.4 (Bazel6), ruby: jruby-9.4.3.0, bazel: 6.0.0}
+ - { name: Ruby 2.7, ruby: ruby-2.7.0, ffi: NATIVE }
+ - { 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.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: Linux ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
runs-on: ubuntu-latest
@@ -38,9 +36,9 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-{1}-508417e5215994ade7585d28ba3aad681a25fa5d', matrix.ruby, matrix.bazel) }}
+ image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-6.3.0-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea', 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' || '' }}
@@ -56,14 +54,14 @@
- name: Cross compile protoc for aarch64
id: cross-compile
- uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
+ uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
+ image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-aarch64
- name: Run tests
- uses: protocolbuffers/protobuf-ci/docker@v1
+ uses: protocolbuffers/protobuf-ci/docker@v2
with:
image: arm64v8/ruby:2.7.3-buster
skip-staleness-check: true
@@ -109,7 +107,7 @@
run: ruby --version | grep ${{ matrix.version }} || (echo "Invalid Ruby version - $(ruby --version)" && exit 1)
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel@v1
+ uses: protocolbuffers/protobuf-ci/bazel@v2
with:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: ruby_macos/${{ matrix.version }}
@@ -122,16 +120,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, bazel: 5.1.1, ffi: NATIVE }
- - { name: Ruby 2.7, ruby: ruby-2.7.0, bazel: 5.1.1, ffi: FFI }
- - { name: Ruby 3.0, ruby: ruby-3.0.2, bazel: 5.1.1}
- - { name: Ruby 3.1, ruby: ruby-3.1.0, bazel: 5.1.1}
- - { name: Ruby 3.2, ruby: ruby-3.2.0, bazel: 5.1.1, ffi: NATIVE }
- - { name: Ruby 3.2, ruby: ruby-3.2.0, bazel: 5.1.1, ffi: FFI }
- - { name: JRuby 9.4, ruby: jruby-9.4.3.0, bazel: 5.1.1, ffi: NATIVE }
- - { name: JRuby 9.4, ruby: jruby-9.4.3.0, bazel: 5.1.1, ffi: FFI }
- - { name: Ruby 2.7 (Bazel6), ruby: ruby-2.7.0, bazel: 6.0.0}
- - { name: JRuby 9.4 (Bazel6), ruby: jruby-9.4.3.0, bazel: 6.0.0}
+ - { name: Ruby 2.7, ruby: ruby-2.7.0, ffi: NATIVE }
+ - { 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.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: Install ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }}
runs-on: ubuntu-latest
steps:
@@ -140,9 +136,9 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:${{ matrix.ruby }}-${{ matrix.bazel }}-508417e5215994ade7585d28ba3aad681a25fa5d
+ image: us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:${{ matrix.ruby }}-6.3.0-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: ruby_install/${{ matrix.ruby }}_${{ matrix.bazel }}
bash: >
diff --git a/.github/workflows/test_rust.yml b/.github/workflows/test_rust.yml
index ee86f6d..086ac50 100644
--- a/.github/workflows/test_rust.yml
+++ b/.github/workflows/test_rust.yml
@@ -21,9 +21,9 @@
with:
ref: ${{ inputs.safe-checkout }}
- name: Run tests
- uses: protocolbuffers/protobuf-ci/bazel-docker@v1
+ uses: protocolbuffers/protobuf-ci/bazel-docker@v2
with:
- image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.0.0-6361b3a6e5c97e9951d03a4de28542fc45f1adab
+ image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: rust_linux
bazel: |
