From 1f21947dd16af91fa920e0e8c7ae93de313871a3 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Thu, 2 Jul 2020 10:40:13 +0800 Subject: [PATCH 1/2] agent: fix protobuf depenedency So that we don't use the latest one that requires unstable rust features. Signed-off-by: Peng Tao --- src/agent/Cargo.toml | 2 +- src/agent/netlink/Cargo.toml | 2 +- src/agent/protocols/Cargo.toml | 2 +- src/agent/rustjail/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index 3c6922a847..1fdfb60bbf 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -13,7 +13,7 @@ netlink = { path = "netlink" } lazy_static = "1.3.0" error-chain = "0.12.1" grpcio = { git="https://github.com/alipay/grpc-rs", branch="rust_agent" } -protobuf = "2.6.1" +protobuf = "=2.6.1" futures = "0.1.27" libc = "0.2.58" nix = "0.17.0" diff --git a/src/agent/netlink/Cargo.toml b/src/agent/netlink/Cargo.toml index 53d50cad48..c3cfe6d327 100644 --- a/src/agent/netlink/Cargo.toml +++ b/src/agent/netlink/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] libc = "0.2.58" nix = "0.17.0" -protobuf = "2.6.1" +protobuf = "=2.6.1" rustjail = { path = "../rustjail" } protocols = { path = "../protocols" } slog = { version = "2.5.2", features = ["dynamic-keys", "max_level_trace", "release_max_level_info"] } diff --git a/src/agent/protocols/Cargo.toml b/src/agent/protocols/Cargo.toml index fc68c94769..4a576abf14 100644 --- a/src/agent/protocols/Cargo.toml +++ b/src/agent/protocols/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] grpcio = { git="https://github.com/alipay/grpc-rs", branch="rust_agent" } -protobuf = "2.6.1" +protobuf = "=2.6.1" futures = "0.1.27" diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml index 030ee85c3c..bf5daf95ee 100644 --- a/src/agent/rustjail/Cargo.toml +++ b/src/agent/rustjail/Cargo.toml @@ -17,7 +17,7 @@ scopeguard = "1.0.0" prctl = "1.0.0" lazy_static = "1.3.0" libc = "0.2.58" -protobuf = "2.6.1" +protobuf = "=2.6.1" slog = "2.5.2" slog-scope = "4.1.2" scan_fmt = "0.2" From 8af8129a1a34f6cb617edd87bda71541a45b9aac Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Mon, 29 Jun 2020 03:20:06 +0000 Subject: [PATCH 2/2] release: Kata Containers 1.12.0-alpha0 - agent: fix protobuf depenedency - ci: install rust back to 1.42.0 to avoid ci failure. - release: actions: pin artifact to v1 1f21947d agent: fix protobuf depenedency ba3078b8 ci: install rust back to 1.42.0 to avoid ci failure. bf567135 release: actions: pin artifact to v1 Signed-off-by: Peng Tao --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 46d0bdd026..dbf1ae9ca4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.11.0-rc0 +1.12.0-alpha0