From 4775a3330147c45636c74460662ce91279ddded1 Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Tue, 13 Oct 2026 14:18:40 -0400 Subject: [PATCH] ci: update at-head builds to be compatible with bazel 9 --- ci/cloudbuild/builds/grpc-at-head.sh | 7 ++----- ci/cloudbuild/builds/protobuf-at-head.sh | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/cloudbuild/builds/grpc-at-head.sh b/ci/cloudbuild/builds/grpc-at-head.sh index bdf98298cb2b0..cdcc76b93101c 100755 --- a/ci/cloudbuild/builds/grpc-at-head.sh +++ b/ci/cloudbuild/builds/grpc-at-head.sh @@ -23,14 +23,11 @@ source module ci/cloudbuild/builds/lib/integration.sh source module ci/etc/quickstart-config.sh rm -fr /h/grpc && git -C /h clone -q --depth 1 https://github.com/grpc/grpc.git -rm -fr /h/protobuf && mkdir -p /h/protobuf && - curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | - tar -C /h/protobuf -xzf - --strip-components=1 mapfile -t args < <(bazel::common_args) args+=( - "--override_repository=com_github_grpc_grpc=/h/grpc" - "--override_repository=com_google_protobuf=/h/protobuf" + "--override_module=grpc=/h/grpc" + "--incompatible_autoload_externally=+@rules_cc" ) bazel test "${args[@]}" --test_tag_filters=-integration-test "${BAZEL_TARGETS[@]}" diff --git a/ci/cloudbuild/builds/protobuf-at-head.sh b/ci/cloudbuild/builds/protobuf-at-head.sh index 60794302bd053..bb1df57f650c7 100755 --- a/ci/cloudbuild/builds/protobuf-at-head.sh +++ b/ci/cloudbuild/builds/protobuf-at-head.sh @@ -25,7 +25,7 @@ rm -fr /h/protobuf && git -C /h clone -q --depth 1 https://github.com/protocolbu mapfile -t args < <(bazel::common_args) args+=( - "--override_repository=com_google_protobuf=/h/protobuf" + "--override_module=protobuf=/h/protobuf" ) bazel test "${args[@]}" --test_tag_filters=-integration-test "${BAZEL_TARGETS[@]}"