Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.5.0] Mark --blazerc as allows_multiple in flag docs #24878

Merged
merged 1 commit into from
Jan 9, 2025
Merged

[7.5.0] Mark --blazerc as allows_multiple in flag docs #24878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/google/devtools/build/lib/bazel/BazelStartupOptionsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
import com.google.devtools.common.options.OptionDocumentationCategory;
import com.google.devtools.common.options.OptionEffectTag;
import com.google.devtools.common.options.OptionsBase;
import java.util.List;

/** Provides Bazel startup flags. */
public class BazelStartupOptionsModule extends BlazeModule {
/** Bazelrc file flags. */
public static final class Options extends OptionsBase {
@Option(
name = "bazelrc",
allowMultiple = true,
defaultValue = "null", // NOTE: purely decorative, rc files are read by the client.
documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
effectTags = {OptionEffectTag.CHANGES_INPUTS},
Expand All @@ -45,7 +47,7 @@ public static final class Options extends OptionsBase {
+ "the following two locations: the workspace directory, then the user's home "
+ "directory.\n"
+ "Note: command line options will always supersede any option in bazelrc.")
public String blazerc;
public List<String> blazerc;

// For the system_rc, it can be /etc/bazel.bazelrc, or a special Windows value, or can be
// custom-set by the Bazel distributor. We don't list a known path in the help output in order
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/integration/startup_options_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function test_autodetect_server_javabase() {
# Below are the regression tests for Issue #7489
function test_multiple_bazelrc_later_overwrites_earlier() {
# Help message only visible with --help_verbosity=medium
help_message_in_description="--${PRODUCT_NAME}rc (a string; default: see description)"
help_message_in_description="--${PRODUCT_NAME}rc (a string; may be used multiple times)"

echo "help --help_verbosity=short" > 1.rc
echo "help --help_verbosity=medium" > 2.rc
Expand Down
Loading