Repository navigation
fix: preserve bootstrap_impl in exec config #4477
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.
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
Open
StephanDollberg
wants to merge
2
commits into
bazel-contrib:main
Choose a base branch
from
StephanDollberg:bootstrap-impl-universal-scope
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Fixed {obj}`--bootstrap_impl` resetting to `system_python` for build tools, | ||
| such as a `py_binary` run by a `genrule`, under Bazel 10. Tools no longer need | ||
| a system `python3` when `--bootstrap_impl=script` is set. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| common --lockfile_mode=off | ||
| test --test_output=errors | ||
| build --enable_runfiles | ||
| # Mitigate transient CI network failures via mirror fallback and retries. | ||
| common --experimental_downloader_config=../../../downloader_config.cfg | ||
| common --http_timeout_scaling=10.0 | ||
| common --experimental_repository_downloader_retries=10 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| load("@rules_python//python:py_binary.bzl", "py_binary") | ||
|
|
||
| py_binary( | ||
| name = "tool", | ||
| srcs = ["tool.py"], | ||
| ) | ||
|
|
||
| # Records the first line of the launcher of :tool as built for the exec | ||
| # configuration, which shows the bootstrap it uses. | ||
| genrule( | ||
| name = "tool_launcher", | ||
| outs = ["tool_launcher.txt"], | ||
| cmd = "head -n 1 $(execpath :tool) > $@", | ||
| tools = [":tool"], | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| module(name = "bootstrap_impl_exec_config") | ||
|
|
||
| bazel_dep(name = "rules_python", version = "0.0.0") | ||
| local_path_override( | ||
| module_name = "rules_python", | ||
| path = "../../..", | ||
| ) | ||
|
|
||
| python = use_extension("@rules_python//python/extensions:python.bzl", "python") | ||
| python.toolchain(python_version = "3.13") |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # Intentionally blank; bzlmod is used. |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| print("tool") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| """Integration test for --bootstrap_impl in the exec configuration. | ||
|
|
||
| Verifies that a py_binary run by a genrule uses the bootstrap set with | ||
| --bootstrap_impl on the command line. Bazel 10 resets Starlark flags in the | ||
| exec configuration unless they have universal scope. | ||
| """ | ||
|
|
||
| import pathlib | ||
| import unittest | ||
|
|
||
| from tests.integration import runner | ||
|
|
||
|
|
||
| class BootstrapImplExecConfigTest(runner.TestCase): | ||
| def test_genrule_tool_uses_bootstrap_script(self): | ||
| """The launcher of the genrule tool is the script bootstrap.""" | ||
| self.run_bazel( | ||
| "build", | ||
| "--@rules_python//python/config_settings:bootstrap_impl=script", | ||
| "//:tool_launcher", | ||
| ) | ||
| execution_root = self.run_bazel("info", "execution_root").stdout.strip() | ||
| result = self.run_bazel( | ||
| "cquery", | ||
| "--@rules_python//python/config_settings:bootstrap_impl=script", | ||
| "--output=files", | ||
| "//:tool_launcher", | ||
| ) | ||
| launcher = pathlib.Path(execution_root, result.stdout.strip()) | ||
| self.assertEqual(launcher.read_text().strip(), "#!/usr/bin/env bash") | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do if maintainers agree.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes please, a test for this would be good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added