From fa827897758c965ffdb22537a6abe9ab7897a2a7 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Tue, 13 Aug 2024 09:36:53 -0700 Subject: [PATCH] chore: disable proto toolchain resolution allows the example to be tested on Bazel 6, which is still relevant test coverage? --- example/.bazelrc | 4 +++- example/tools/format/BUILD.bazel | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/example/.bazelrc b/example/.bazelrc index 1913390b..512de7f5 100644 --- a/example/.bazelrc +++ b/example/.bazelrc @@ -5,7 +5,9 @@ common --enable_platform_specific_config # see https://github.com/bazelbuild/rules_jvm_external/issues/445 build --repo_env=JAVA_HOME=../bazel_tools/jdk -common --incompatible_enable_proto_toolchain_resolution +# TODO(alexeagle): opt-in to this flag when we drop Bazel 6 testing +# common --incompatible_enable_proto_toolchain_resolution + common --@aspect_rules_ts//ts:skipLibCheck=always # enable symlinks on windows diff --git a/example/tools/format/BUILD.bazel b/example/tools/format/BUILD.bazel index a6f44934..78ba1bc0 100644 --- a/example/tools/format/BUILD.bazel +++ b/example/tools/format/BUILD.bazel @@ -99,7 +99,8 @@ format_test( # kotlin = ":ktfmt", markdown = ":prettier", no_sandbox = True, # Enables formatting the entire workspace, paired with 'workspace' attribute - protocol_buffer = "//tools/lint:buf", + # TODO(alexeagle): enable when --incompatible_enable_proto_toolchain_resolution can be flipped in .bazelrc + # protocol_buffer = "//tools/lint:buf", python = "@aspect_rules_lint//format:ruff", scala = ":scalafmt", sql = ":prettier",