Skip to content

Commit

Permalink
chore: disable proto toolchain resolution
Browse files Browse the repository at this point in the history
allows the example to be tested on Bazel 6, which is still relevant test coverage?
  • Loading branch information
alexeagle committed Aug 13, 2024
1 parent e47a193 commit fa82789
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion example/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion example/tools/format/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit fa82789

Please sign in to comment.