From 4c031d1030afb1cb48c7e6d71f83cc99fea607c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?X=C3=B9d=C5=8Dng=20Y=C3=A1ng?= Date: Thu, 17 Mar 2022 15:40:12 +0100 Subject: [PATCH] [5.1] Undocument --bes_best_effort (#15066) We've heared from several people that they tried passing the flag and it did not have any efect (as expected from a no-op), so let's undocument the flag so it's no longer discoverable. On a related note, we should document `--bes_upload_mode` which seems to be what people want to do. Closes #14333. PiperOrigin-RevId: 435317406 Co-authored-by: Yannic Bonenberger --- .../build/lib/bazel/rules/BazelRulesModule.java | 11 +++++++++++ .../buildeventservice/BuildEventServiceOptions.java | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java index 86bfe9179511b5..8b78611bfa5bca 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java @@ -487,6 +487,17 @@ public static final class AllCommandGraveyardOptions extends OptionsBase { documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, help = "No-op") public boolean enableCpuUsageProfiling; + + @Option( + name = "bes_best_effort", + defaultValue = "false", + deprecationWarning = + "BES best effort upload has been removed. The flag has no more " + + "functionality attached to it and will be removed in a future release.", + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, + help = "No-op") + public boolean besBestEffort; } @Override diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceOptions.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceOptions.java index b8bbeb9969919c..fb91b018cb69fd 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceOptions.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceOptions.java @@ -65,19 +65,6 @@ public class BuildEventServiceOptions extends OptionsBase { allowMultiple = true) public List> besHeaders; - @Option( - name = "bes_best_effort", - defaultValue = "false", - deprecationWarning = - "BES best effort upload has been removed. The flag has no more " - + "functionality attached to it and will be removed in a future release.", - documentationCategory = OptionDocumentationCategory.LOGGING, - effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, - help = - "BES best effort upload has been removed. The flag has no more " - + "functionality attached to it and will be removed in a future release.") - public boolean besBestEffort; - @Option( name = "bes_lifecycle_events", defaultValue = "true",