Skip to content

Commit 203e9ad

Browse files
authored
fix
1 parent 8a6326d commit 203e9ad

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/test_bazel.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ jobs:
3030
bazelversion: [ '7.6.1', '8.0.0' ]
3131
bzlmod: [ true, false ]
3232
toolchain_resolution:
33-
# Default flags, uses from-source protoc
34-
- ""
35-
# still uses from-source protoc unless
36-
# --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc is set
37-
- "--incompatible_enable_proto_toolchain_resolution=true"
33+
# Skip toolchain resolution, use //:protoc cc_binary target directly; uses from-source protoc
34+
- "--noincompatible_enable_proto_toolchain_resolution"
35+
# still uses from-source protoc because
36+
# --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc is not set
37+
# We must do this because we test a prerelease of protobuf which would violate the cross-version-runtime-guarantee
38+
- "--incompatible_enable_proto_toolchain_resolution --no@protobuf//bazel/toolchains:prefer_prebuilt_protoc"
3839
runs-on: ${{ matrix.runner }}-latest
3940
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Examples ${{ matrix.runner }} ${{ matrix.bazelversion }}${{ matrix.bzlmod && ' (bzlmod)' || '' }} ${{ matrix.toolchain_resolution && ' (toolchain resolution)' || '' }}
4041
steps:

0 commit comments

Comments
 (0)