From 4d536cc9ebe043ab505dd8b070469ad90585d9dc Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Tue, 9 Jul 2024 14:15:46 -0400 Subject: [PATCH] Also revert most of #238 - we're no longer testing --incompatible_enable_proto_toolchain_resolution --- .bazelrc | 3 --- test/bzlmod/.bazelrc | 2 -- 2 files changed, 5 deletions(-) diff --git a/.bazelrc b/.bazelrc index 33808dd..b968cdc 100644 --- a/.bazelrc +++ b/.bazelrc @@ -4,6 +4,3 @@ build --tool_java_language_version=11 # Incompatible flags which we always want in development build --incompatible_disable_starlark_host_transitions build --incompatible_disallow_empty_glob - -# Incompatible flags to test in a dedicated CI pipeline. -build:incompatible --incompatible_enable_proto_toolchain_resolution diff --git a/test/bzlmod/.bazelrc b/test/bzlmod/.bazelrc index 305a751..7a949e8 100644 --- a/test/bzlmod/.bazelrc +++ b/test/bzlmod/.bazelrc @@ -6,5 +6,3 @@ build --tool_java_language_version=11 build --incompatible_disable_starlark_host_transitions build --incompatible_disallow_empty_glob -# Incompatible flags to test in a dedicated CI pipeline. -build:incompatible --incompatible_enable_proto_toolchain_resolution