Instead of duplicating the name, use oldName for it.

PiperOrigin-RevId: 545818305 Change-Id: Icbebf74b73121c99cc63c7dff1d1594b03285801
bazelbuild · Jul 5, 2023 · e3af34a · e3af34a
1 parent 95c15c8
commit e3af34a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
@@ -460,11 +460,7 @@ public boolean useValidationAspect() {
 
   private OutputGroupInfo.ValidationMode validationMode() {
     BuildRequestOptions buildOptions = getBuildOptions();
-    // "and" these together so that --noexperimental_run_validation and --norun_validations work
-    // as expected.
-    boolean runValidationActions =
-        buildOptions.runValidationActions && buildOptions.experimentalRunValidationActions;
-    if (!runValidationActions) {
+    if (!buildOptions.runValidationActions) {
       return OutputGroupInfo.ValidationMode.OFF;
     }
     return buildOptions.useValidationAspect

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
@@ -160,16 +160,9 @@ public class BuildRequestOptions extends OptionsBase {
               + " bar are built.")
   public List<String> outputGroups;
 
-  @Option(
-      name = "experimental_run_validations",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
-      effectTags = {OptionEffectTag.EXECUTION, OptionEffectTag.AFFECTS_OUTPUTS},
-      help = "Use --run_validations instead.")
-  public boolean experimentalRunValidationActions;
-
   @Option(
       name = "run_validations",
+      oldName = "experimental_run_validations",
       defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.EXECUTION, OptionEffectTag.AFFECTS_OUTPUTS},