Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ msrv_build_task:
cpu: 2 # Do not increase, will result in scheduling delays
memory: "8Gb"
# When bumping the image always remember to update the README MSRV as well.
image: quay.io/libpod/nv-rust:1.83
image: quay.io/libpod/nv-rust:1.86
script:
- make build

Expand Down
102 changes: 73 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository = "https://github.com/containers/netavark"
categories = ["virtualization"]
exclude = ["/.cirrus.yml", "/.github/*", "/hack/*"]
build = "build.rs"
rust-version = "1.83"
rust-version = "1.86"

[package.metadata.vendor-filter]
platforms = ["*-unknown-linux-*"]
Expand Down Expand Up @@ -53,9 +53,10 @@ nftables = "0.6.3"
fs2 = "0.4.3"
tokio = { version = "1.47.1", features = ["rt", "rt-multi-thread", "signal", "fs"] }
tokio-stream = { version = "0.1.17", features = ["net"] }
tonic = "0.13.1"
tonic = "0.14.2"
tonic-prost = "0.14.2"
prost = "0.14.1"
mozim = "0.2.7"
prost = "0.13.5"
futures-channel = "0.3.31"
futures-core = "0.3.31"
futures-util = "0.3.31"
Expand All @@ -64,7 +65,7 @@ hyper-util = "0.1.16"

[build-dependencies]
chrono = { version = "0.4.41", default-features = false, features = ["clock"] }
tonic-build = "0.13.1"
tonic-prost-build = "0.14.0"

[dev-dependencies]
once_cell = "1.21.3"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Netavark is a tool for configuring networking for Linux containers. Its features

## MSRV (Minimum Supported Rust Version)

v1.83
v1.86

We test that Netavark can be build on this Rust version and on some newer versions.
All newer versions should also build, and if they do not, the issue should be
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::path::Path;
use std::process::Command;

fn main() {
let builder = tonic_build::configure()
let builder = tonic_prost_build::configure()
.type_attribute("netavark_proxy.Lease", "#[derive(serde::Serialize)]")
.type_attribute("netavark_proxy.DhcpV4Lease", "#[derive(serde::Serialize)]")
.type_attribute("netavark_proxy.DhcpV6Lease", "#[derive(serde::Serialize)]")
Expand Down
2 changes: 1 addition & 1 deletion contrib/container_images/Dockerfile.Rust
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Source for quay.io/libpod/nv-rust
# This version should always match the MSRV, when you update this also update
# the version in the root README.md and Cargo.toml.
FROM docker.io/library/rust:1.83
FROM docker.io/library/rust:1.86
RUN apt-get update && apt-get -y install protobuf-compiler libprotobuf-dev