Skip to content

Update CARGO environment variable if it is set to a rustup proxy#4275

Merged
rami3l merged 2 commits intorust-lang:masterfrom
ChrisDenton:no-proxy-env
Apr 4, 2025
Merged

Update CARGO environment variable if it is set to a rustup proxy#4275
rami3l merged 2 commits intorust-lang:masterfrom
ChrisDenton:no-proxy-env

Conversation

@ChrisDenton
Copy link
Copy Markdown
Member

This is done only if we know the absolute path to the real cargo and only if we're sure that CARGO points to a proxy.

Fixes #4274

Copy link
Copy Markdown
Member

@rami3l rami3l left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Not a blocker, but do we have a way to reliably test this though?

@ChrisDenton
Copy link
Copy Markdown
Member Author

Not a blocker, but do we have a way to reliably test this though?

Hm. Not easily without some bigger changes to the testing framework... actually I guess I can manually create a symlink to a mock cargo in a test. That might work.

@ChrisDenton ChrisDenton force-pushed the no-proxy-env branch 2 times, most recently from 39b63e7 to a5f27cc Compare April 4, 2025 04:33
@rami3l rami3l added this pull request to the merge queue Apr 4, 2025
@rami3l rami3l removed this pull request from the merge queue due to a manual request Apr 4, 2025
@rami3l rami3l enabled auto-merge April 4, 2025 12:03
@rami3l rami3l added this pull request to the merge queue Apr 4, 2025
Merged via the queue into rust-lang:master with commit 18b8e34 Apr 4, 2025
29 checks passed
@ChrisDenton ChrisDenton deleted the no-proxy-env branch April 4, 2025 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CARGO environment variable, if set to a proxy, should be changed to match the selected toolchain

3 participants