Skip to content
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 rustc and cargo commands to use envvars. #808

Merged
merged 1 commit into from
Jun 16, 2022

Conversation

Alexhuszagh
Copy link
Contributor

rustc and cargo will now use RUSTC and CARGO environment variables, respectively, if present.

@Alexhuszagh Alexhuszagh added bug no changelog A valid PR without changelog (no-changelog) labels Jun 16, 2022
@Alexhuszagh Alexhuszagh requested a review from a team as a code owner June 16, 2022 16:24
src/docker/shared.rs Outdated Show resolved Hide resolved
@Emilgardis
Copy link
Member

r=me when commit message fixed

@Alexhuszagh
Copy link
Contributor Author

bors r=Emilgardis

@bors
Copy link
Contributor

bors bot commented Jun 16, 2022

👎 Rejected by code reviews

Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 16, 2022

Merge conflict.

`rustc` and `cargo` will now use `RUSTC` and `CARGO` environment
variables, respectively, if present.
@Alexhuszagh
Copy link
Contributor Author

bors r=Emilgardis

bors bot added a commit that referenced this pull request Jun 16, 2022
808: Update `rustc` and `cargo` commands to use envvars. r=Emilgardis a=Alexhuszagh

`rustc` and `cargo` will now use `RUSTC` and `CARGO` environment variables, respectively, if present.

810: fix typo in readme for dockerfile building r=Alexhuszagh a=Emilgardis

resolves #809

Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
@bors
Copy link
Contributor

bors bot commented Jun 16, 2022

This PR was included in a batch that was canceled, it will be automatically retried

@bors
Copy link
Contributor

bors bot commented Jun 16, 2022

Build succeeded:

@bors bors bot merged commit 204d123 into cross-rs:main Jun 16, 2022
@Emilgardis Emilgardis added this to the v0.2.2 milestone Jun 18, 2022
@Alexhuszagh Alexhuszagh deleted the cargo_command branch June 23, 2022 23:25
Alexhuszagh added a commit to Alexhuszagh/cross that referenced this pull request Jun 26, 2022
Provides behavior consistent with `cargo` itself, which also ignores it.

Closes cross-rs#864.
Supersedes cross-rs#865.
Partially reverts cross-rs#808.
bors bot added a commit that referenced this pull request Jun 26, 2022
868: Ignore the `CARGO` environment variable. r=Emilgardis a=Alexhuszagh

Provides behavior consistent with `cargo` itself, which also ignores it.

Closes #864.
Supersedes #865.
Partially reverts #808.

Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug no changelog A valid PR without changelog (no-changelog)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants