Skip to content

Commit 25d7981

Browse files
Adam Cozzettecopybara-github
Adam Cozzette
authored and
copybara-github
committed
Upgrade to Bazel 7.6.1
This is necessary for upgrading setuptools, because older Bazel versions apparently can't handle whitespace in file names: #22094 PiperOrigin-RevId: 780210543
1 parent 960e790 commit 25d7981

File tree

11 files changed

+25
-25
lines changed

11 files changed

+25
-25
lines changed

‎.bazeliskrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
USE_BAZEL_VERSION=7.1.2
1+
USE_BAZEL_VERSION=7.6.1

‎.github/workflows/staleness_check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
# commit.
5151
uses: protocolbuffers/protobuf-ci/bazel@v4
5252
with:
53-
version: 7.1.2 # Bazel version
53+
version: 7.6.1 # Bazel version
5454
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
5555
bazel-cache: staleness
5656
# TODO: Enable bzlmod once //python/dist is buildable.

‎.github/workflows/test_bazel.yml‎

Lines changed: 1 addition & 1 deletion
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.1.2', '8.0.0' ]
30+
bazelversion: [ '7.6.1', '8.0.0' ]
3131
bzlmod: [ true, false ]
3232
toolchain_resolution: [ "", "--incompatible_enable_proto_toolchain_resolution=true" ]
3333
runs-on: ${{ matrix.runner }}-latest

‎.github/workflows/test_cpp.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242
# Override cases with custom images
4343
- config: { name: "Bazel7", flags: --cxxopt="-Wno-self-assign-overloaded" }
4444
cache_key: Bazel7bzlmod
45-
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75"
45+
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604"
4646
targets: "//src/... //third_party/utf8_range/..."
4747
- config: { name: "Bazel7 Workspace", flags: --noenable_bzlmod }
4848
cache_key: Bazel7nobzlmod
49-
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75"
49+
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604"
5050
targets: "//src/... //third_party/utf8_range/..."
5151
- config: { name: "Bazel8", flags: --cxxopt="-Wno-self-assign-overloaded" }
5252
cache_key: Bazel8
@@ -59,7 +59,7 @@ jobs:
5959
- config: { name: "aarch64", flags: "--platforms=//build_defs:aarch64_linux" }
6060
cache_key: aarch64-bazel8
6161
targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test //third_party/utf8_range/..."
62-
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8" #TODO: b/409557730 - upgrade to bazel 8
62+
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.6.1-aarch64-f0d1e209ed9369f69d93ce418990ecff3aa08d6f" #TODO: b/409557730 - upgrade to bazel 8
6363
name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.config.name }}
6464
runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }}
6565
steps:
@@ -121,7 +121,7 @@ jobs:
121121
id: cross-compile
122122
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
123123
with:
124-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75 #TODO: b/409557730 - upgrade to bazel 8
124+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 #TODO: b/409557730 - upgrade to bazel 8
125125
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
126126
architecture: linux-${{ matrix.arch }}
127127
- name: Setup sccache

‎.github/workflows/test_java.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ jobs:
4646
targets: //java/... //java/internal:java_version //compatibility/...
4747
- name: Bazel7
4848
cache_key: 'bazel7bzlmod'
49-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75
49+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604
5050
targets: //java/... //java/internal:java_version //compatibility/...
5151
- name: Bazel7 Workspace
5252
cache_key: 'bazel7nobzlmod'
53-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75
53+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604
5454
targets: //java/... //java/internal:java_version //compatibility/...
5555
flags: --noenable_bzlmod
5656
# TODO: b/395623141 - restore this test once runtime uses / emulates aarch64.
5757
# - name: aarch64
5858
# cache_key: 'aarch64'
59-
# image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8
59+
# image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.6.1-aarch64-f0d1e209ed9369f69d93ce418990ecff3aa08d6f
6060
# targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test
6161

6262
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name }}

‎.github/workflows/test_php.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
id: cross-compile
122122
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
123123
with:
124-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75 #TODO: b/409557730 - upgrade to bazel 8.0.1
124+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 #TODO: b/409557730 - upgrade to bazel 8.0.1
125125
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
126126
architecture: linux-i386
127127

@@ -160,7 +160,7 @@ jobs:
160160
id: cross-compile
161161
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
162162
with:
163-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75 #TODO: b/409557730 - upgrade to bazel 8.0.1
163+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 #TODO: b/409557730 - upgrade to bazel 8.0.1
164164
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
165165
architecture: linux-aarch64
166166

‎.github/workflows/test_python.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
# TODO Enable this once conformance tests are fixed.
5353
flags: --define=use_fast_cpp_protos=true --test_tag_filters=-conformance
5454
bzlmod: --noenable_bzlmod
55-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8
55+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.6.1-aarch64-f0d1e209ed9369f69d93ce418990ecff3aa08d6f
5656

5757
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.type }} ${{ matrix.version }}
5858
runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
6666
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
6767
uses: protocolbuffers/protobuf-ci/bazel-docker@v4
6868
with:
69-
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:7.1.2-{0}-d9624f2aa83cba3eaf906f751d75b36aacb9aa82', matrix.version) }}
69+
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:7.6.1-{0}-12e21b8dda91028bc14212a3ab582c7c4d149fac', matrix.version) }}
7070
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
7171
bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }}
7272
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} ${{ matrix.bzlmod }} --test_env=KOKORO_PYTHON_VERSION
@@ -117,7 +117,7 @@ jobs:
117117
env:
118118
KOKORO_PYTHON_VERSION: ${{ matrix.version }}
119119
with:
120-
version: 7.1.2 # Bazel version
120+
version: 7.6.1 # Bazel version
121121
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
122122
bazel-cache: python_macos/${{ matrix.type }}_${{ matrix.version }}
123123
bazel: >-

‎.github/workflows/test_ruby.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
id: cross-compile
7878
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
7979
with:
80-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75 #TODO: b/409557730 - upgrade to bazel 8.0.1
80+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 #TODO: b/409557730 - upgrade to bazel 8.0.1
8181
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
8282
architecture: linux-i386
8383

@@ -108,7 +108,7 @@ jobs:
108108
id: cross-compile
109109
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
110110
with:
111-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75 #TODO: b/409557730 - upgrade to bazel 8.0.1
111+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 #TODO: b/409557730 - upgrade to bazel 8.0.1
112112
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
113113
architecture: linux-aarch64
114114

‎.github/workflows/test_rust.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
# rules_rust does not support workspace + bazel 8, so we test workspace + bazel 7
3838
- name: "No bzlmod"
39-
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75"
39+
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604"
4040

4141
name: Linux ${{ matrix.config.name }}
4242
runs-on: ubuntu-22-4core

‎.github/workflows/test_upb.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
5050
uses: protocolbuffers/protobuf-ci/bazel-docker@v4
5151
with:
52-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize:${{ matrix.config.bazel_version || '7.1.2' }}-2c05f44c25a209933743ddf0296ef0c1e583d2c3
52+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize:${{ matrix.config.bazel_version || '7.6.1' }}-12e21b8dda91028bc14212a3ab582c7c4d149fac
5353
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
5454
bazel-cache: upb-bazel
5555
# TODO: Enable bzlmod once python headers are supported for python dist.
@@ -69,7 +69,7 @@ jobs:
6969
- name: Run tests
7070
uses: protocolbuffers/protobuf-ci/bazel-docker@v4
7171
with:
72-
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:7.1.2-12.2-e78301df86b3e4c46ec9ac4d98be00e19305d8f3"
72+
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:7.6.1-12.2-12e21b8dda91028bc14212a3ab582c7c4d149fac"
7373
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
7474
bazel-cache: "upb-bazel-gcc"
7575
bazel: >-
@@ -97,7 +97,7 @@ jobs:
9797
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
9898
bazel-cache: "upb-bazel-windows"
9999
bazel: test --noenable_bzlmod --cxxopt=/std:c++17 --host_cxxopt=/std:c++17 //upb/... //upb_generator/... //python/...
100-
version: 7.1.2
100+
version: 7.6.1
101101
exclude-targets: -//python:conformance_test -//upb/reflection:def_builder_test
102102

103103
macos:
@@ -126,7 +126,7 @@ jobs:
126126
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
127127
bazel-cache: "upb-bazel-macos"
128128
bazel: ${{ matrix.config.bazel-command }} --noenable_bzlmod --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 ${{ matrix.config.flags }} //bazel/... //benchmarks/... //lua/... //python/... //upb/... //upb_generator/...
129-
version: 7.1.2
129+
version: 7.6.1
130130

131131
no-python:
132132
strategy:
@@ -141,7 +141,7 @@ jobs:
141141
- name: Run tests
142142
uses: protocolbuffers/protobuf-ci/bazel-docker@v4
143143
with:
144-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75
144+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604
145145
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
146146
bazel-cache: "upb-bazel-no-python"
147147
bash: >-
@@ -162,7 +162,7 @@ jobs:
162162
- name: Build Wheels
163163
uses: protocolbuffers/protobuf-ci/bazel-docker@v4
164164
with:
165-
image: us-docker.pkg.dev/protobuf-build/release-containers/linux/apple:7.1.2-d9624f2aa83cba3eaf906f751d75b36aacb9aa82
165+
image: us-docker.pkg.dev/protobuf-build/release-containers/linux/apple:7.6.1-12e21b8dda91028bc14212a3ab582c7c4d149fac
166166
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
167167
bazel-cache: upb-bazel-python
168168
bazel: build --noenable_bzlmod --crosstool_top=//toolchain:clang_suite --//toolchain:release=true --symlink_prefix=/ -c dbg --incompatible_enable_cc_toolchain_resolution=false //python/dist //python/dist:test_wheel //python/dist:source_wheel

0 commit comments

Comments
 (0)