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

Add --force-non-host flag. #554

Merged
merged 1 commit into from
Jul 17, 2022
Merged

Conversation

reitermarkus
Copy link
Member

Closes #536.

@reitermarkus reitermarkus requested review from Dylan-DPC-zz and a team as code owners May 2, 2021 13:24
@reitermarkus reitermarkus force-pushed the force-non-host branch 2 times, most recently from b00fed4 to db6e6af Compare May 2, 2021 13:25
@Dylan-DPC-zz
Copy link

bors: r+

bors bot added a commit that referenced this pull request May 2, 2021
554: Add `--force-non-host` flag. r=Dylan-DPC a=reitermarkus

Closes #536.

Co-authored-by: Markus Reiter <me@reitermark.us>
@bors
Copy link
Contributor

bors bot commented May 2, 2021

Build failed:

@reitermarkus
Copy link
Member Author

bors retry

bors bot added a commit that referenced this pull request Jul 14, 2021
554: Add `--force-non-host` flag. r=Dylan-DPC a=reitermarkus

Closes #536.

Co-authored-by: Markus Reiter <me@reitermark.us>
@bors
Copy link
Contributor

bors bot commented Jul 14, 2021

Build failed:

@reitermarkus
Copy link
Member Author

@rbtcollins, rustup toolchain install doesn't seem to have this option and cross doesn't call rustup update anywhere.

@Emilgardis
Copy link
Member

just a small nitpick, should this be backported into https://github.com/rust-embedded/cross/tree/v0.2.1 ?

@rbtcollins
Copy link

Hmmmm, will look into that. Internally the two are basically aliases.

@Emilgardis
Copy link
Member

What's the status on this? @rbtcollins

@rbtcollins
Copy link

We added the flag to rustup, and its in a deprecation period where it isn't required. I encourage merging the use of the flag, so that we can move forward with making it required.

There is a UI glitch associated with it triggering unnecessarily in some cases on Windows, but we should get that fixed for the next release I hope

@Emilgardis
Copy link
Member

bors retry

bors bot added a commit that referenced this pull request Aug 11, 2021
554: Add `--force-non-host` flag. r=Dylan-DPC a=reitermarkus

Closes #536.

Co-authored-by: Markus Reiter <me@reitermark.us>
@bors
Copy link
Contributor

bors bot commented Aug 11, 2021

Build failed:

@adamgreig
Copy link
Member

It looks like this is failing on MacOS and Windows builds with:

+ cross check --target x86_64-apple-darwin
error: Found argument '--force-non-host' which wasn't expected, or isn't valid in this context
	Did you mean --force?

USAGE:
    rustup toolchain install <toolchain>... --force

For more information try --help
error: couldn't install toolchain `1.42.0-x86_64-unknown-linux-gnu`
caused by: `"rustup" "toolchain" "install" "--force-non-host" "1.42.0-x86_64-unknown-linux-gnu"` failed with exit code: Some(1)
note: run with `RUST_BACKTRACE=1` for a backtrace

i.e., related to adding --force-non-host, any ideas?

@reitermarkus
Copy link
Member Author

We added the flag to rustup, and its in a deprecation period where it isn't required.

@rbtcollins, rustup toolchain install still doesn't accept this flag.

@Emilgardis
Copy link
Member

rust-lang/rustup#2968 has been merged, not sure when next release is

@otavio
Copy link
Contributor

otavio commented Jun 10, 2022

As rustup has support for it, are this going in 0.2.2?

@Emilgardis
Copy link
Member

As rustup has support for it, are this going in 0.2.2?

this issue is blocked on new rustup release, it can't be included without upstream support

@Alexhuszagh
Copy link
Contributor

As rustup has support for it, are this going in 0.2.2?

We need to wait for a release that supports it, because 1.24.3 doesn't, which I believe is the latest? And we check currently for 1.24.0.

$ rustup toolchain install 1.58.0 --force-non-host
error: Found argument '--force-non-host' which wasn't expected, or isn't valid in this context
        Did you mean --force?

USAGE:
    rustup toolchain install <toolchain>... --force

For more information try --help
$ rustup -V
rustup 1.24.3 (ce5817a94 2021-05-31)
info: This is the version for the rustup toolchain manager, not the rustc compiler.
info: The currently active `rustc` version is `rustc 1.61.0 (fe5b13d68 2022-05-18)

So we need to wait for a later release, but yes, if this is done prior to our 0.22 release, I think we should add this.

@otavio
Copy link
Contributor

otavio commented Jun 10, 2022

We could check for 1.24.4 as it has been merged already.

@Alexhuszagh Alexhuszagh requested a review from a team as a code owner July 2, 2022 19:34
Copy link
Contributor

@Alexhuszagh Alexhuszagh left a comment

Choose a reason for hiding this comment

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

Ok it seems like rustup doesn't have different branches, so it's safe to assume this will be in 1.24.4. @Emilgardis look good?

@Alexhuszagh
Copy link
Contributor

I accidentally rebased it off the wrong branch, I've since fixed it. @reitermarkus can you squash the commits down to a single one and we can merge it?

@Emilgardis
Copy link
Member

rustup 1.25.0 has been released, containing the fix

https://blog.rust-lang.org/2022/07/11/Rustup-1.25.0.html

@Alexhuszagh
Copy link
Contributor

We should probably merge this quickly then.

CHANGELOG.md Outdated Show resolved Hide resolved
src/rustup.rs Outdated Show resolved Hide resolved
@Alexhuszagh Alexhuszagh force-pushed the force-non-host branch 3 times, most recently from e4acb50 to fad7b5c Compare July 12, 2022 17:31
src/rustup.rs Outdated Show resolved Hide resolved
src/rustup.rs Outdated Show resolved Hide resolved
src/rustup.rs Outdated Show resolved Hide resolved
Co-authored-by: Markus Reiter <me@reitermark.us>
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 Jul 17, 2022

Build succeeded:

@bors bors bot merged commit 91e0377 into cross-rs:main Jul 17, 2022
@Emilgardis Emilgardis added this to the v0.3.0 milestone Aug 10, 2022
@reitermarkus reitermarkus deleted the force-non-host branch August 17, 2022 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Please add --force-non-host for rustup 1.24 and up
7 participants