Merge pull request #350 from bergwolf/1.12.0-alpha0-branch-bump

# Kata Containers 1.12.0-alpha0
release: Kata Containers 1.12.0-alpha0
2026-03-17 02:02:34 +00:00 · 2020-07-02 12:00:22 +08:00 · 2020-07-02 10:41:09 +08:00 · 2020-07-02 10:40:13 +08:00 · 2020-05-21 14:06:33 +01:00 · 2020-05-19 10:14:23 +08:00
6 changed files with 8 additions and 5 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-1.11.4
+1.12.0-alpha0
--- 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"
--- a/src/agent/Makefile
+++ b/src/agent/Makefile
@@ -72,6 +72,9 @@ default: $(TARGET) show-header
 $(TARGET): $(TARGET_PATH)

 $(TARGET_PATH): $(SOURCES) | show-summary
+	@rustup default 1.42.0
+	@rustup toolchain install 1.42.0-musl
+	@rustup target add $(ARCH)-unknown-linux-musl
 	@cargo build --target $(TRIPLE)

 show-header:
--- 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"] }
--- 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"
--- 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"
Author	SHA1	Message	Date
Peng Tao	c2539b1b3d	Merge pull request #350 from bergwolf/1.12.0-alpha0-branch-bump # Kata Containers 1.12.0-alpha0	2020-07-02 12:00:22 +08:00
Peng Tao	8af8129a1a	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 <bergwolf@hyper.sh>	2020-07-02 10:41:09 +08:00
Peng Tao	1f21947dd1	agent: fix protobuf depenedency So that we don't use the latest one that requires unstable rust features. Signed-off-by: Peng Tao <bergwolf@hyper.sh>	2020-07-02 10:40:13 +08:00
James O. D. Hunt	e902aeb5cf	Merge pull request #221 from jongwu/cargo ci: install rust back to 1.42.0 to avoid ci failure.	2020-05-21 14:06:33 +01:00
Jianyong Wu	ba3078b8e5	ci: install rust back to 1.42.0 to avoid ci failure. There maybe a bug in the 1.43.1 cargo, so we need install rust back to 1.42.0 to avoid the failure when make the rust agent using the latest rust. Fixes: #202 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>	2020-05-19 10:14:23 +08:00
Jose Carlos Venegas Munoz	a276da6194	Merge pull request #212 from jcvenegas/fix-211 release: actions: pin artifact to v1	2020-05-07 10:28:19 -05:00
Jose Carlos Venegas Munoz	bf5671357e	release: actions: pin artifact to v1 the actions upload/download-artifact moved to a new version and master now is not comptible. Fixes: #211 Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>	2020-05-07 03:48:03 +00:00