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 innernet to v1.5.0 #432

Merged
merged 10 commits into from
Nov 18, 2021
Merged

Update innernet to v1.5.0 #432

merged 10 commits into from
Nov 18, 2021

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Sep 17, 2021

No description provided.

@Eeems Eeems mentioned this pull request Sep 19, 2021
@Eeems
Copy link
Member Author

Eeems commented Sep 20, 2021

@plan5 any idea why it's no longer building?

@plan5
Copy link

plan5 commented Sep 20, 2021

@plan5 any idea why it's no longer building?

Makes no sense to me... I've even copied your package file and built locally without errors. The only difference between #432 and #434 seems to be the timestamp.

I am using self-compiled build-images for aarch64 though.

@Eeems
Copy link
Member Author

Eeems commented Sep 20, 2021

I don't believe we ever ran the builds on your PR, so it might not have been building as well. Could it be that rust needs an update?
@matteodelabre thoughts?

@plan5
Copy link

plan5 commented Sep 21, 2021

I've compiled in verbose mode and this is the error that pops up:
http://ix.io/3zw3

Adding time = "0.3.2" to the dependencies section of $srcdir/share/Cargo.toml might be a temporary fix and another hint that Eeems is right.

@Eeems
Copy link
Member Author

Eeems commented Sep 21, 2021

That's the same error we are getting in the pipeline:

[   ERROR] toltec.builder: innernet [rmall]: Compiling wireguard-control v1.5.0 (/src/wireguard-control)
[   ERROR] toltec.builder: innernet [rmall]: Compiling shared v1.5.0 (/src/shared)
[   ERROR] toltec.builder: innernet [rmall]: error[E0658]: use of unstable library feature 'duration_constants'
[   ERROR] toltec.builder: innernet [rmall]: --> shared/src/wg.rs:234:24
[   ERROR] toltec.builder: innernet [rmall]: |
[   ERROR] toltec.builder: innernet [rmall]: 234 |             .unwrap_or(Duration::MAX);
[   ERROR] toltec.builder: innernet [rmall]: |                        ^^^^^^^^^^^^^
[   ERROR] toltec.builder: innernet [rmall]: |
[   ERROR] toltec.builder: innernet [rmall]: = note: see issue #57391 <https://github.com/rust-lang/rust/issues/57391> for more information
[   ERROR] toltec.builder: innernet [rmall]: = help: add `#![feature(duration_constants)]` to the crate attributes to enable
[   ERROR] toltec.builder: innernet [rmall]: 
[   ERROR] toltec.builder: innernet [rmall]: error: aborting due to previous error
[   ERROR] toltec.builder: innernet [rmall]: 
[   ERROR] toltec.builder: innernet [rmall]: For more information about this error, try `rustc --explain E0658`.
[   ERROR] toltec.builder: innernet [rmall]: error: could not compile `shared`

We probably should get a fix for this upstream in innernet since rust-lang/rust#57391 is still open.

@matteodelabre
Copy link
Member

Judging from the discussion in the issue you linked, the Duration::max constant has been stabilized separately from the other proposed duration constants. So this build error is because the Rust version in our toolchain is outdated. Indeed, I’ve tried to build it with a more recent Rust version and it compiles fine. I’m going to publish an update of the toolchain.

@matteodelabre
Copy link
Member

Build fixed!

@Eeems
Copy link
Member Author

Eeems commented Oct 3, 2021

Anybody had time to test and approve so I can merge this?

Copy link
Contributor

@raisjn raisjn left a comment

Choose a reason for hiding this comment

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

unblocking

@Eeems Eeems merged commit 6d3f886 into testing Nov 18, 2021
@Eeems Eeems deleted the Eeems-patch-2 branch November 18, 2021 15:44
Eeems added a commit that referenced this pull request Nov 27, 2021
* Update innernet to v1.5.0
* Use build image rust:v2.2

Co-authored-by: Mattéo Delabre <1370040+matteodelabre@users.noreply.github.com>
Co-authored-by: Mattéo Delabre <spam@delab.re>
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.

4 participants