From e9be08ea8d7253b2014a50f44c915465a5caf5f1 Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 29 Nov 2022 02:14:40 -0800 Subject: [PATCH] Automated rollback of commit 7bd0ab63a8441c3f3d7f495d09ed2bed38762874. *** Reason for rollback *** Breaks rules_apple. The incompatible flags pipeline incorrectly reported the change as safe because setting the flag doesn't invalidate the build (so we got cached results from building without the flag). *** Original change description *** Default --incompatible_strict_conflict_checks to true. The downstream pipeline indicates that this is safe to flip: https://buildkite.com/bazel/bazelisk-plus-incompatible-flags/builds/1346 Fixes #16729. RELNOTES[INC]: `--incompatible_strict_conflict_checks` is flipped to true. See https://github.com/bazelbuild/bazel/issues/16729 for details. PiperOrigin-RevId: 491573531 Change-Id: I1b34790d12cee4377e76118897c819873ddcb291 --- .../google/devtools/build/lib/analysis/AnalysisOptions.java | 2 +- .../build/lib/remote/BuildWithoutTheBytesIntegrationTest.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java index b8ca3c08405d99..f7cc3967b0b436 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java @@ -93,7 +93,7 @@ public class AnalysisOptions extends OptionsBase { @Option( name = "incompatible_strict_conflict_checks", oldName = "experimental_strict_conflict_checks", - defaultValue = "true", + defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, metadataTags = OptionMetadataTag.INCOMPATIBLE_CHANGE, effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION}, diff --git a/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java index 920dd8870308f8..70e138cbc34ed3 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java @@ -312,8 +312,6 @@ public void symlinkToDirectory() throws Exception { @Test public void symlinkToNestedFile() throws Exception { - addOptions("--noincompatible_strict_conflict_checks"); - write( "a/defs.bzl", "def _impl(ctx):", @@ -366,8 +364,6 @@ public void symlinkToNestedFile() throws Exception { @Test public void symlinkToNestedDirectory() throws Exception { - addOptions("--noincompatible_strict_conflict_checks"); - write( "a/defs.bzl", "def _impl(ctx):",