-
Notifications
You must be signed in to change notification settings - Fork 402
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
Update deps #929
Update deps #929
Conversation
I think this is dropping the |
Yes - I don't want to maintain a long-term fork, and I want to start pulling in |
aad256b
to
bcfe7a4
Compare
cargo/cargo_bootstrap.bzl
Outdated
@@ -55,12 +55,17 @@ def cargo_bootstrap( | |||
if build_mode == "release": | |||
args.append("--release") | |||
|
|||
env = {} | |||
|
|||
if repository_ctx.attr.include_perl_on_windows and "win" in repository_ctx.os.name: |
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.
Instead of always using setting PERL
here, could the cargo_bootstrap_repository
rule take an env
section which allows users to set these?
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.
I added a windows_env_vars_to_labels
which does this just on Windows, but it feels still pretty similarly specific...
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.
windows_env_vars_to_labels
to me is an improvement but not quite what I had in mind. Would something like #932 work for you?
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.
Works for me! Though exactly which triple I should be using for "Whatever CI is on Windows" I'm not sure :D
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.
I'd probably just use:
x86_64-pc-windows-gnu
x86_64-pc-windows-msvc
Perhaps that section could be expanded to support matching on components of a triple, system
, vendor
, etc... Host detection is not the easiest thing to do sadly... I wish there was more in Bazel to make this easy.
59a8ce6
to
c4e013b
Compare
c4e013b
to
ecc132e
Compare
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.
One last question 😅
.bazelci/presubmit.yml
Outdated
@@ -223,6 +225,7 @@ tasks: | |||
platform: windows | |||
environment: | |||
RULES_RUST_CRATE_UNIVERSE_BOOTSTRAP: true | |||
OPENSSL_STATIC: "1" |
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.
Could this potentially be passed as an env
attribute to the bootstrap definition to avoid having two places where environment variables are set?
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.
Two more comments but I leave it up to you to decide what to do with them. Looks good to me! Thanks for updating this 🙏
Co-authored-by: UebelAndre <github@uebelandre.com>
No description provided.