Skip to content

[9.1.0] Make is_tool_configuration public (https://github.com/bazelbuild/bazel/pull/29056) #29106

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

Merged
iancha1992 merged 1 commit into from
Mar 27, 2026
+8 −13
Merged

[9.1.0] Make is_tool_configuration public (https://github.com/bazelbuild/bazel/pull/29056) #29106

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
6 changes: 0 additions & 6 deletions src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,12 +753,6 @@ public boolean isToolConfiguration() {
return isExecConfiguration();
}

@Override
public boolean isToolConfigurationForStarlark(StarlarkThread thread) throws EvalException {
BuiltinRestriction.failIfCalledOutsideDefaultAllowlist(thread);
return isToolConfiguration();
}

public boolean checkVisibility() {
return options.checkVisibility;
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BuildConfigurationApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ public interface BuildConfigurationApi extends StarlarkValue {
@StarlarkMethod(name = "stamp_binaries", documented = false, useStarlarkThread = true)
boolean stampBinariesForStarlark(StarlarkThread thread) throws EvalException;

@StarlarkMethod(name = "is_tool_configuration", documented = false, useStarlarkThread = true)
boolean isToolConfigurationForStarlark(StarlarkThread thread) throws EvalException;
@StarlarkMethod(
name = "is_tool_configuration",
doc = "Returns true when building in the tool (exec) configuration.")
boolean isToolConfiguration();

@StarlarkMethod(
name = "has_separate_genfiles_directory",
Expand Down
9 changes: 4 additions & 5 deletions ...st/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationStarlarkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def _test_rule_impl(ctx):
}

@Test
public void testIsToolConfigurationIsBlocked() throws Exception {
public void testIsToolConfiguration() throws Exception {
scratch.file(
"example/BUILD",
"""
Expand All @@ -90,15 +90,14 @@ public void testIsToolConfigurationIsBlocked() throws Exception {
"example/rule.bzl",
"""
def _impl(ctx):
ctx.configuration.is_tool_configuration()
if ctx.configuration.is_tool_configuration():
fail("should not be tool configuration")
return [DefaultInfo()]

custom_rule = rule(implementation = _impl)
""");

AssertionError e =
assertThrows(AssertionError.class, () -> getConfiguredTarget("//example:custom"));
assertThat(e).hasMessageThat().contains("file '//example:rule.bzl' cannot use private API");
getConfiguredTarget("//example:custom");
}

@Test
Expand Down
Loading