From c29f88309c6b0ba41f9fc3afb1922225688d1aa7 Mon Sep 17 00:00:00 2001 From: Yannic Bonenberger Date: Thu, 25 Nov 2021 15:14:05 +0100 Subject: [PATCH 1/3] Undocument --bes_best_effort 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. --- .../build/lib/buildeventservice/BuildEventServiceOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 022309152426f1..35b5acef14cab2 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 @@ -71,7 +71,7 @@ public class BuildEventServiceOptions extends OptionsBase { 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, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "BES best effort upload has been removed. The flag has no more " From 26b23f7b5cca4a77f28121941e8088593df21ccb Mon Sep 17 00:00:00 2001 From: Yannic Bonenberger Date: Wed, 15 Dec 2021 13:14:35 +0100 Subject: [PATCH 2/3] send it to graveyard --- .../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 fd17c975dde17e..451494f0feb4f7 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 @@ -309,6 +309,17 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.UNKNOWN}, help = "No-op") public boolean experimentalMultiThreadedDigest; + + @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; } /** This is where deprecated Bazel-specific options only used by the build command go to die. */ 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 35b5acef14cab2..c0c7bebd328c7d 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.UNDOCUMENTED, - 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", From b472596e5c2955fa3d983e87fa4266b2063edb0f Mon Sep 17 00:00:00 2001 From: Yannic Bonenberger Date: Wed, 26 Jan 2022 22:54:03 +0100 Subject: [PATCH 3/3] mv to AllCommandGraveyardOptions --- .../lib/bazel/rules/BazelRulesModule.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 5962cd46300b89..d03cc011432970 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 @@ -309,17 +309,6 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.UNKNOWN}, help = "No-op") public boolean experimentalMultiThreadedDigest; - - @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; } /** This is where deprecated Bazel-specific options only used by the build command go to die. */ @@ -516,6 +505,17 @@ public static final class AllCommandGraveyardOptions extends OptionsBase { metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op.") public boolean incompatibleApplicableLicenses; + + @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