Drop Bazel 7 tests for bazel, python, partially java partially cpp.

C++, java, PHP, Ruby and upb still have some cross-compilation Bazel 7 tests.

PiperOrigin-RevId: 855994201
This commit is contained in:
Jie Luo 2026-01-13 20:08:33 -08:00 committed by Copybara-Service
parent 8d886cf5be
commit b046c9a30e
7 changed files with 7 additions and 16 deletions

View file

@ -1,7 +1,7 @@
# LINT.IfChange(bazelci_presubmit)
matrix:
platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
bazel: [7.x, 8.x]
bazel: [8.x]
tasks:
verify_targets:

View file

@ -1 +1 @@
USE_BAZEL_VERSION=7.6.1
USE_BAZEL_VERSION=8.0.1

View file

@ -3,7 +3,7 @@ bcr_test_module:
module_path: examples
matrix:
platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
bazel: [7.x, 8.x]
bazel: [8.x]
tasks:
verify_targets:

View file

@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
runner: [ ubuntu, windows, macos ]
bazelversion: [ '7.6.1', '8.0.0' ]
bazelversion: [ '8.0.0' ]
bzlmod: [ true, false ]
toolchain_resolution:
# Default flags, uses from-source protoc
@ -87,4 +87,4 @@ jobs:
version: ${{ matrix.bazelversion }}
bash: >
cd examples/example_without_cc_toolchain;
bazel build //... $BAZEL_FLAGS --enable_bzlmod=true ${{ matrix.toolchain_resolution }};
bazel build //... $BAZEL_FLAGS ${{ matrix.toolchain_resolution }};

View file

@ -44,10 +44,6 @@ jobs:
cache_key: Bazel7bzlmod
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604"
targets: "//src/... //third_party/utf8_range/..."
- config: { name: "Bazel7 Workspace", flags: --noenable_bzlmod }
cache_key: Bazel7nobzlmod
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604"
targets: "//src/... //third_party/utf8_range/..."
- config: { name: "Bazel8", flags: --cxxopt="-Wno-self-assign-overloaded" }
cache_key: Bazel8
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-e78301df86b3e4c46ec9ac4d98be00e19305d8f3"

View file

@ -48,11 +48,6 @@ jobs:
cache_key: 'bazel7bzlmod'
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604
targets: //java/... //java/internal:java_version //compatibility/...
- name: Bazel7 Workspace
cache_key: 'bazel7nobzlmod'
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604
targets: //java/... //java/internal:java_version //compatibility/...
flags: --noenable_bzlmod
# TODO: b/395623141 - restore this test once runtime uses / emulates aarch64.
# - name: aarch64
# cache_key: 'aarch64'

View file

@ -64,7 +64,7 @@ jobs:
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
with:
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:7.6.1-{0}-5237f14696e60e4b050edfbf7ba9b374f37f83c6', matrix.version) }}
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:8.0.1-{0}-5237f14696e60e4b050edfbf7ba9b374f37f83c6', matrix.version) }}
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }}
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} ${{ matrix.nobzlmod && '--noenable_bzlmod' || '' }} --test_env=KOKORO_PYTHON_VERSION
@ -115,7 +115,7 @@ jobs:
env:
KOKORO_PYTHON_VERSION: ${{ matrix.version }}
with:
version: 7.6.1 # Bazel version
version: 8.0.1 # Bazel version
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: python_macos/${{ matrix.type }}_${{ matrix.version }}
bazel: >-