Make url overrides for downloading toolchains work. #874
+5
−2
Conversation
This file contains 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
illicitonion
reviewed
Aug 3, 2021
| @@ -526,8 +526,7 @@ def load_arbitrary_tool(ctx, tool_name, tool_subdirectories, version, iso_date, | |||
| # View the indices mentioned in the docstring to find the tool_suburl for a given | |||
| # tool. | |||
| tool_suburl = produce_tool_suburl(tool_name, target_triple, version, iso_date) | |||
| static_rust = ctx.os.environ.get("STATIC_RUST_URL", "https://static.rust-lang.org") | |||
| urls = ["{}/dist/{}.tar.gz".format(static_rust, tool_suburl)] | |||
| urls = [] | |||
There was a problem hiding this comment.
This code used to allow adding a URL by setting an env var, and this PR removes that ability - how would you feel about making this look something like:
urls = []
static_rust_url_from_env = ctx.os.environ.get("STATIC_RUST_URL")
if static_rust_url_from_env:
urls.append("{}/dist/{}.tar.gz".format(static_rust_url_from_env, tool_suburl))that way if the env var isn't set, it still behaves exactly as you've written, but if it is we still pay attention to it.
There was a problem hiding this comment.
Thats a good point. +1
I'll push a new revision.
Previously, the default url template for downloading toolchains was always present as the first place to download tools from. This prevents overriding the default location for the tools so that an internal mirror can be used. Fixes bazelbuild#867
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously, the default url template for downloading toolchains
was always present as the first place to download tools from. This
prevents overriding the default location for the tools so that an
internal mirror can be used.
Fixes #867