Skip to content

Commit f92587d

Browse files
anandoleecopybara-github
authored andcommitted
Drop Bazel 7 tests for bazel, java, and partially cpp and python.
C++, PHP, Ruby and upb still have some cross-compilation Bazel 7 tests. PiperOrigin-RevId: 855074337
1 parent 2d8bc46 commit f92587d

File tree

6 files changed

+6
-15
lines changed

6 files changed

+6
-15
lines changed

.bazelci/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# LINT.IfChange(bazelci_presubmit)
22
matrix:
33
platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
4-
bazel: [7.x, 8.x]
4+
bazel: [8.x]
55

66
tasks:
77
verify_targets:

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ bcr_test_module:
33
module_path: examples
44
matrix:
55
platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
6-
bazel: [7.x, 8.x]
6+
bazel: [8.x]
77

88
tasks:
99
verify_targets:

.github/workflows/test_bazel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
runner: [ ubuntu, windows, macos ]
30-
bazelversion: [ '7.6.1', '8.0.0' ]
30+
bazelversion: [ '8.0.0' ]
3131
bzlmod: [ true, false ]
3232
toolchain_resolution:
3333
# Default flags, uses from-source protoc
@@ -87,4 +87,4 @@ jobs:
8787
version: ${{ matrix.bazelversion }}
8888
bash: >
8989
cd examples/example_without_cc_toolchain;
90-
bazel build //... $BAZEL_FLAGS --enable_bzlmod=true ${{ matrix.toolchain_resolution }};
90+
bazel build //... $BAZEL_FLAGS ${{ matrix.toolchain_resolution }};

.github/workflows/test_cpp.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ jobs:
4444
cache_key: Bazel7bzlmod
4545
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604"
4646
targets: "//src/... //third_party/utf8_range/..."
47-
- config: { name: "Bazel7 Workspace", flags: --noenable_bzlmod }
48-
cache_key: Bazel7nobzlmod
49-
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604"
50-
targets: "//src/... //third_party/utf8_range/..."
5147
- config: { name: "Bazel8", flags: --cxxopt="-Wno-self-assign-overloaded" }
5248
cache_key: Bazel8
5349
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-e78301df86b3e4c46ec9ac4d98be00e19305d8f3"

.github/workflows/test_java.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ jobs:
4848
cache_key: 'bazel7bzlmod'
4949
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604
5050
targets: //java/... //java/internal:java_version //compatibility/...
51-
- name: Bazel7 Workspace
52-
cache_key: 'bazel7nobzlmod'
53-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604
54-
targets: //java/... //java/internal:java_version //compatibility/...
55-
flags: --noenable_bzlmod
5651
# TODO: b/395623141 - restore this test once runtime uses / emulates aarch64.
5752
# - name: aarch64
5853
# cache_key: 'aarch64'

.github/workflows/test_python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
6565
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
6666
with:
67-
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:7.6.1-{0}-5237f14696e60e4b050edfbf7ba9b374f37f83c6', matrix.version) }}
67+
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:8.0.1-{0}-5237f14696e60e4b050edfbf7ba9b374f37f83c6', matrix.version) }}
6868
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
6969
bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }}
7070
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} ${{ matrix.nobzlmod && '--noenable_bzlmod' || '' }} --test_env=KOKORO_PYTHON_VERSION
@@ -115,7 +115,7 @@ jobs:
115115
env:
116116
KOKORO_PYTHON_VERSION: ${{ matrix.version }}
117117
with:
118-
version: 7.6.1 # Bazel version
118+
version: 8.0.1 # Bazel version
119119
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
120120
bazel-cache: python_macos/${{ matrix.type }}_${{ matrix.version }}
121121
bazel: >-

0 commit comments

Comments
 (0)