From fe169654a29d8ad33105d5d0034a7857834fed5d Mon Sep 17 00:00:00 2001 From: Tiago Quelhas Date: Mon, 28 Nov 2022 16:35:03 +0100 Subject: [PATCH] [6.0.0] Default --incompatible_strict_conflict_checks to true. (#16864) 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: 491324038 Change-Id: Iea8951867fa20f2aa1a67bf3ba3c86c26e4292de --- .../google/devtools/build/lib/analysis/AnalysisOptions.java | 5 +++-- .../lib/remote/BuildWithoutTheBytesIntegrationTest.java | 4 ++++ 2 files changed, 7 insertions(+), 2 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 2a7c75b4b4ee73..b8ca3c08405d99 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 @@ -91,8 +91,9 @@ public class AnalysisOptions extends OptionsBase { public boolean skyframePrepareAnalysis; @Option( - name = "experimental_strict_conflict_checks", - defaultValue = "false", + name = "incompatible_strict_conflict_checks", + oldName = "experimental_strict_conflict_checks", + defaultValue = "true", 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 70e138cbc34ed3..920dd8870308f8 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,6 +312,8 @@ public void symlinkToDirectory() throws Exception { @Test public void symlinkToNestedFile() throws Exception { + addOptions("--noincompatible_strict_conflict_checks"); + write( "a/defs.bzl", "def _impl(ctx):", @@ -364,6 +366,8 @@ public void symlinkToNestedFile() throws Exception { @Test public void symlinkToNestedDirectory() throws Exception { + addOptions("--noincompatible_strict_conflict_checks"); + write( "a/defs.bzl", "def _impl(ctx):",