Skip to content

Commit fff4905

Browse files
mkruskal-googlemkruskal-google
committed
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
1 parent db616e7 commit fff4905

12 files changed

Lines changed: 164 additions & 96 deletions

‎.github/workflows/test_cpp.yml‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,16 @@ jobs:
2626
- { name: No-RTTI, flags: --cxxopt=-fno-rtti }
2727
include:
2828
# Set defaults
29-
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:309dae3122031447d714414814d262e5f31cb93c0e248e9c02f9d8cdafd7e3b9
29+
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:04cd765285bc52cbbf51d66c8c66d8603579cf0f19cc42df26b09d2c270541fb
3030
- targets: //pkg/... //src/... @com_google_protobuf_examples//...
3131

3232
# Override cases with custom images
3333
- config: { name: "TCMalloc" }
34-
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:4df3b4749e787ba0a671ec0b783d0f1ba05f60be4c9e9fd72c875550a0cde1ea"
34+
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:e4493c58e7c3f3a0775e0b19a46bc822e866a5275b7a5463f509af8072f283db"
3535
targets: "//src/..."
3636
- config: { name: "aarch64" }
3737
targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test"
38-
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-3af05275178e16af30961976af126eabbbb2c733"
39-
# TODO(b/278116805) Enable this once Bazel 6 is supported.
40-
#- config: { name: "Bazel6" }
41-
# targets: "//src/..."
42-
# image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.0.0-6361b3a6e5c97e9951d03a4de28542fc45f1adab"
38+
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-222e7e87028b7098e088f5ca7cae06d32f483eb5"
4339
name: Linux ${{ matrix.config.name }}
4440
runs-on: ubuntu-latest
4541
steps:
@@ -48,7 +44,7 @@ jobs:
4844
with:
4945
ref: ${{ inputs.safe-checkout }}
5046
- name: Run tests
51-
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
47+
uses: protocolbuffers/protobuf-ci/bazel-docker@v2
5248
with:
5349
image: ${{ matrix.image }}
5450
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -68,9 +64,9 @@ jobs:
6864
with:
6965
ref: ${{ inputs.safe-checkout }}
7066
- name: Run tests
71-
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
67+
uses: protocolbuffers/protobuf-ci/bazel-docker@v2
7268
with:
73-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:${{ matrix.version }}-5.4.0-2d15d9e888c9e7f90961dbd3afc8ea209717fb4b
69+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:${{ matrix.version }}-6.3.0-518b4fcd8d0ded2484c94f02e835526cacfdac2d
7470
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
7571
bazel-cache: cpp_linux/gcc-${{ matrix.version }}
7672
bazel: test //pkg/... //src/... @com_google_protobuf_examples//...
@@ -90,19 +86,19 @@ jobs:
9086
submodules: recursive
9187
- name: Cross compile protoc for ${{ matrix.arch }}
9288
id: cross-compile
93-
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
89+
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v2
9490
with:
95-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
91+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
9692
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
9793
architecture: linux-${{ matrix.arch }}
9894
- name: Setup ccache
99-
uses: protocolbuffers/protobuf-ci/ccache@v1
95+
uses: protocolbuffers/protobuf-ci/ccache@v2
10096
with:
10197
cache-prefix: linux-release-${{ matrix.arch }}
10298
- name: Run tests
103-
uses: protocolbuffers/protobuf-ci/docker@v1
99+
uses: protocolbuffers/protobuf-ci/docker@v2
104100
with:
105-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:${{ matrix.arch }}-3af05275178e16af30961976af126eabbbb2c733
101+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:${{ matrix.arch }}-222e7e87028b7098e088f5ca7cae06d32f483eb5
106102
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
107103
entrypoint: bash
108104
command: >
@@ -137,12 +133,12 @@ jobs:
137133
ref: ${{ inputs.safe-checkout }}
138134

139135
- name: Setup ccache
140-
uses: protocolbuffers/protobuf-ci/ccache@v1
136+
uses: protocolbuffers/protobuf-ci/ccache@v2
141137
with:
142138
cache-prefix: linux-cmake-${{ matrix.name }}
143139

144140
- name: Run tests
145-
uses: protocolbuffers/protobuf-ci/docker@v1
141+
uses: protocolbuffers/protobuf-ci/docker@v2
146142
with:
147143
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-e6272cdfe97c6df307e17b83f3a7a70844f6fc08
148144
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -162,12 +158,12 @@ jobs:
162158
submodules: recursive
163159

164160
- name: Setup ccache
165-
uses: protocolbuffers/protobuf-ci/ccache@v1
161+
uses: protocolbuffers/protobuf-ci/ccache@v2
166162
with:
167163
cache-prefix: linux-cmake-install
168164

169165
- name: Run tests
170-
uses: protocolbuffers/protobuf-ci/docker@v1
166+
uses: protocolbuffers/protobuf-ci/docker@v2
171167
with:
172168
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
173169
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -191,12 +187,12 @@ jobs:
191187
ref: ${{ inputs.safe-checkout }}
192188

193189
- name: Setup ccache
194-
uses: protocolbuffers/protobuf-ci/ccache@v1
190+
uses: protocolbuffers/protobuf-ci/ccache@v2
195191
with:
196192
cache-prefix: linux-cmake-examples
197193

198194
- name: Run tests
199-
uses: protocolbuffers/protobuf-ci/docker@v1
195+
uses: protocolbuffers/protobuf-ci/docker@v2
200196
with:
201197
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
202198
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -231,14 +227,14 @@ jobs:
231227
submodules: recursive
232228

233229
- name: Setup ccache
234-
uses: protocolbuffers/protobuf-ci/ccache@v1
230+
uses: protocolbuffers/protobuf-ci/ccache@v2
235231
with:
236232
cache-prefix: linux-cmake-gcc-${{ matrix.name }}
237233

238234
- name: Run tests
239-
uses: protocolbuffers/protobuf-ci/docker@v1
235+
uses: protocolbuffers/protobuf-ci/docker@v2
240236
with:
241-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:12.2-5.4.0-307caa02808127e49720f3e77d6a9f3b3ef5a915
237+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:12.2-6.3.0-518b4fcd8d0ded2484c94f02e835526cacfdac2d
242238
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
243239
entrypoint: bash
244240
command: >-
@@ -261,12 +257,12 @@ jobs:
261257
submodules: recursive
262258

263259
- name: Setup ccache
264-
uses: protocolbuffers/protobuf-ci/ccache@v1
260+
uses: protocolbuffers/protobuf-ci/ccache@v2
265261
with:
266262
cache-prefix: linux-cmake-${{ matrix.name }}
267263

268264
- name: Run tests
269-
uses: protocolbuffers/protobuf-ci/docker@v1
265+
uses: protocolbuffers/protobuf-ci/docker@v2
270266
with:
271267
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
272268
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -285,12 +281,12 @@ jobs:
285281
submodules: recursive
286282

287283
- name: Setup ccache
288-
uses: protocolbuffers/protobuf-ci/ccache@v1
284+
uses: protocolbuffers/protobuf-ci/ccache@v2
289285
with:
290286
cache-prefix: linux-cmake-32-bit
291287

292288
- name: Run tests
293-
uses: protocolbuffers/protobuf-ci/docker@v1
289+
uses: protocolbuffers/protobuf-ci/docker@v2
294290
with:
295291
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:f99f051daa8b12f4ebad5927f389bc71372f771ab080290ab451cbaf1648f9ea
296292
platform: linux/386
@@ -331,7 +327,7 @@ jobs:
331327
with:
332328
ref: ${{ inputs.safe-checkout }}
333329
- name: Run tests
334-
uses: protocolbuffers/protobuf-ci/bazel@v1
330+
uses: protocolbuffers/protobuf-ci/bazel@v2
335331
with:
336332
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
337333
bazel: ${{ matrix.bazel }}
@@ -386,15 +382,15 @@ jobs:
386382
submodules: recursive
387383

388384
- name: Setup ccache
389-
uses: protocolbuffers/protobuf-ci/ccache@v1
385+
uses: protocolbuffers/protobuf-ci/ccache@v2
390386
with:
391387
cache-prefix: ${{ matrix.name }}
392388
vsversion: ${{ matrix.vsversion }}
393389

394390
# Install phase.
395391
- name: Configure CMake for install
396392
if: matrix.install-flags
397-
uses: protocolbuffers/protobuf-ci/bash@v1
393+
uses: protocolbuffers/protobuf-ci/bash@v2
398394
with:
399395
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
400396
command: cmake . ${{ matrix.install-flags }} ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -416,7 +412,7 @@ jobs:
416412
run: cmake --build . --target clean && rm CMakeCache.txt
417413

418414
- name: Configure CMake
419-
uses: protocolbuffers/protobuf-ci/bash@v1
415+
uses: protocolbuffers/protobuf-ci/bash@v2
420416
with:
421417
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
422418
command: cmake . ${{ matrix.flags }} ${{ env.CCACHE_CMAKE_FLAGS }}

‎.github/workflows/test_csharp.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
with:
2222
ref: ${{ inputs.safe-checkout }}
2323
- name: Run tests
24-
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
24+
uses: protocolbuffers/protobuf-ci/bazel-docker@v2
2525
with:
26-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:3.1.415-6.0.100-508417e5215994ade7585d28ba3aad681a25fa5d
26+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:3.1.415-6.0.100-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea
2727
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
2828
bazel-cache: csharp_linux
2929
bazel: test //csharp/... --action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 --test_env=DOTNET_CLI_HOME=/home/bazel
@@ -60,7 +60,7 @@ jobs:
6060
- name: Build protobuf C# tests under x86_64 docker image
6161
# Tests are built "dotnet publish" because we want all the dependencies to the copied to the destination directory
6262
# (we want to avoid references to ~/.nuget that won't be available in the subsequent docker run)
63-
uses: protocolbuffers/protobuf-ci/docker@v1
63+
uses: protocolbuffers/protobuf-ci/docker@v2
6464
with:
6565
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim
6666
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -77,7 +77,7 @@ jobs:
7777
# running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
7878
# otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
7979
# we just run map the user's home to a throwaway temporary directory
80-
uses: protocolbuffers/protobuf-ci/docker@v1
80+
uses: protocolbuffers/protobuf-ci/docker@v2
8181
with:
8282
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim-arm64v8
8383
skip-staleness-check: true

‎.github/workflows/test_java.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ jobs:
1919
include:
2020
- name: OpenJDK 8
2121
version: '8'
22-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-03a376b5d6ef66f827fc307716e3b841cc26b709
22+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
2323
targets: //java/... //java/internal:java_version
2424
- name: OpenJDK 11
2525
version: '11'
26-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-03a376b5d6ef66f827fc307716e3b841cc26b709
26+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
2727
targets: //java/... //java/internal:java_version
2828
- name: OpenJDK 17
2929
version: '17'
30-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-03a376b5d6ef66f827fc307716e3b841cc26b709
30+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
3131
targets: //java/... //java/internal:java_version
3232
- name: aarch64
3333
version: 'aarch64'
34-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-3af05275178e16af30961976af126eabbbb2c733
34+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-222e7e87028b7098e088f5ca7cae06d32f483eb5
3535
targets: //java/... //src/google/protobuf/compiler:protoc_aarch64_test
3636

3737
name: Linux ${{ matrix.name }}
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
ref: ${{ inputs.safe-checkout }}
4444
- name: Run tests
45-
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
45+
uses: protocolbuffers/protobuf-ci/bazel-docker@v2
4646
with:
4747
image: ${{ matrix.image }}
4848
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -58,9 +58,9 @@ jobs:
5858
with:
5959
ref: ${{ inputs.safe-checkout }}
6060
- name: Run Linkage Monitor test
61-
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
61+
uses: protocolbuffers/protobuf-ci/bazel-docker@v2
6262
with:
63-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-03a376b5d6ef66f827fc307716e3b841cc26b709
63+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
6464
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
6565
bazel-cache: java_linux/8
6666
bazel: test --test_output=all //java:linkage_monitor --spawn_strategy=standalone
@@ -75,9 +75,9 @@ jobs:
7575
ref: ${{ inputs.safe-checkout }}
7676
- name: Build protoc
7777
id: build-protoc
78-
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
78+
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v2
7979
with:
80-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
80+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.3.0-91a0ac83e968068672bc6001a4d474cfd9a50f1d
8181
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
8282
architecture: linux-x86_64
8383
- name: Move protoc into place and clean up
@@ -89,9 +89,9 @@ jobs:
8989
mvn -e -B -Dhttps.protocols=TLSv1.2 install -Dmaven.test.skip=true
9090
working-directory: java
9191
- name: Generate pom.xml files from the template
92-
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
92+
uses: protocolbuffers/protobuf-ci/bazel-docker@v2
9393
with:
94-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-03a376b5d6ef66f827fc307716e3b841cc26b709
94+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
9595
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
9696
bazel-cache: java_linux/11
9797
# protobuf-java and protobuf-java-util are the member of the BOM

‎.github/workflows/test_objectivec.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939
ref: ${{ inputs.safe-checkout }}
4040

4141
- name: Setup ccache
42-
uses: protocolbuffers/protobuf-ci/ccache@v1
42+
uses: protocolbuffers/protobuf-ci/ccache@v2
4343
with:
4444
cache-prefix: objectivec_${{ matrix.platform }}_${{ matrix.xc_config }}
4545
support-modules: true
4646

4747
- name: Run tests
48-
uses: protocolbuffers/protobuf-ci/bash@v1
48+
uses: protocolbuffers/protobuf-ci/bash@v2
4949
env:
5050
CC: ${{ github.workspace }}/ci/clang_wrapper
5151
CXX: ${{ github.workspace }}/ci/clang_wrapper++
@@ -81,7 +81,7 @@ jobs:
8181
with:
8282
ref: ${{ inputs.safe-checkout }}
8383
- name: Pod lib lint
84-
uses: protocolbuffers/protobuf-ci/bash@v1
84+
uses: protocolbuffers/protobuf-ci/bash@v2
8585
with:
8686
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
8787
command: |
@@ -122,7 +122,7 @@ jobs:
122122
with:
123123
ref: ${{ inputs.safe-checkout }}
124124
- name: bazel ${{ matrix.config.bazel_action }}
125-
uses: protocolbuffers/protobuf-ci/bazel@v1
125+
uses: protocolbuffers/protobuf-ci/bazel@v2
126126
with:
127127
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
128128
bazel: ${{ matrix.config.bazel_action }} ${{ matrix.config.flags }} ${{ matrix.bazel_targets }}

0 commit comments

Comments
 (0)