From 09af436dfaeac30b9080343e05204cada4720f01 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Tue, 14 Dec 2021 18:08:05 +0100 Subject: [PATCH] Update protobuf.yml (#1293) Add `--proto_toolchain_for_cc=//:cc_toolchain` to work around https://github.com/bazelbuild/bazel/issues/10590#issuecomment-986815486 --- pipelines/protobuf.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pipelines/protobuf.yml b/pipelines/protobuf.yml index 1492fb7a65..255a2d5d96 100644 --- a/pipelines/protobuf.yml +++ b/pipelines/protobuf.yml @@ -1,28 +1,25 @@ --- platforms: ubuntu2004: + test_flags: + - "--proto_toolchain_for_cc=//:cc_toolchain" test_targets: - "//:all" - "//java/..." - # `cc_proto_blacklist_test` only works as `@com_google_protobuf//:cc_proto_blacklist_test`. - # https://github.com/bazelbuild/bazel/issues/10590 - - "-//:cc_proto_blacklist_test" - - "@com_google_protobuf//:cc_proto_blacklist_test" + - "//:cc_proto_blacklist_test" macos: + test_flags: + - "--proto_toolchain_for_cc=//:cc_toolchain" test_targets: - "//:all" - "//java/..." - # `cc_proto_blacklist_test` only works as `@com_google_protobuf//:cc_proto_blacklist_test`. - # https://github.com/bazelbuild/bazel/issues/10590 - - "-//:cc_proto_blacklist_test" - - "@com_google_protobuf//:cc_proto_blacklist_test" + - "//:cc_proto_blacklist_test" windows: + test_flags: + - "--proto_toolchain_for_cc=//:cc_toolchain" test_targets: - "//:all" - "//java/..." - # `cc_proto_blacklist_test` only works as `@com_google_protobuf//:cc_proto_blacklist_test`. - # https://github.com/bazelbuild/bazel/issues/10590 - - "-//:cc_proto_blacklist_test" - - "@com_google_protobuf//:cc_proto_blacklist_test" + - "//:cc_proto_blacklist_test" - "-//java/core:conformance_test" - "-//java/lite:conformance_test"