Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Update some dependencies for compilation with pc-windows-gnu #10055

Closed
wants to merge 1 commit into from
Closed

Update some dependencies for compilation with pc-windows-gnu #10055

wants to merge 1 commit into from

Conversation

tomaka
Copy link
Contributor

@tomaka tomaka commented Dec 12, 2018

@tomaka tomaka added A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). A8-backport 🕸 Pull request is already reviewed well in another branch. and removed A8-backport 🕸 Pull request is already reviewed well in another branch. labels Dec 12, 2018
ordian
ordian approved these changes Dec 12, 2018
View reviewed changes
Cargo.lock
@@ -2222,7 +2222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is probably downgrade from rust-lang/cargo#5702, do we want to revert it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm surprised we're not using cargo build --frozen in our CI to detect that kind of problems.

Copy link
Collaborator

@ordian ordian Dec 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I guess cargo update -p rand:0.3.22 should fix that.

@ordian
Copy link
Collaborator

ordian commented Dec 12, 2018

Also android build is failing.

@tomaka
Copy link
Contributor Author

tomaka commented Dec 12, 2018

Also android build is failing.

That's quite funny. We used to erroneously build libusb-sys for x86-64-linux on the Android pipeline, but I assume that it worked because we don't actually use libusb-sys from within Parity when on Android.

Now that this is fixed, we reach a #error "Unsupported OS".

niklasad1
niklasad1 suggested changes Dec 16, 2018
View reviewed changes
Copy link
Collaborator

@niklasad1 niklasad1 left a comment

Choose a reason for hiding this comment

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

The PR looks good but the rand downgrade needs to be reverted

@niklasad1
Copy link
Collaborator

Ok, shall we just not use the hardware-wallet stuff for android temporary?

@ordian
Copy link
Collaborator

ordian commented Dec 18, 2018

I suggest to revert rand downgrade and deal with android in a separate PR. Any opinions?

@tomaka
Copy link
Contributor Author

tomaka commented Dec 18, 2018

I don't think we should make pc-windows-gnu work by breaking Android.
I'll submit another PR.

@tomaka tomaka closed this Dec 18, 2018
@tomaka tomaka deleted the windows-gnu-cross branch December 18, 2018 17:16
@tomaka tomaka mentioned this pull request Dec 18, 2018
Merged
@5chdn 5chdn added this to the 2.3 milestone Jan 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ordian ordian ordian approved these changes

@niklasad1 niklasad1 niklasad1 requested changes

Assignees
No one assigned
Labels
A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update).
Projects
None yet
Milestone
2.3
Development

Successfully merging this pull request may close these issues.
4 participants
@tomaka @ordian @niklasad1 @5chdn