Skip to content

Commit

Permalink
Change CI's rustup version to use rust-toolchain.toml 's version
Browse files Browse the repository at this point in the history
and fix test's fail.
Ref:https://github.com/dsherret/rust-toolchain-file

Signed-off-by: jokemanfire <hu.dingyang@zte.com.cn>
  • Loading branch information
jokemanfire committed Feb 21, 2025
1 parent 9d9cc05 commit e804152
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:

steps:
- uses: actions/checkout@v4

# Use the rust-toolchain-file
- uses: dsherret/rust-toolchain-file@v1
- run: ./scripts/install-protobuf.sh
shell: bash

- run: rustup toolchain install nightly --component rustfmt
- run: cargo +nightly fmt --all -- --check
- run: cargo fmt --all -- --check

# the "runc" and "containerd-shim" crates have `sync` code that is not covered by the workspace
- run: cargo check -p runc --all-targets
Expand Down
3 changes: 2 additions & 1 deletion crates/shim-protos/examples/ttrpc-server-async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ impl Task for FakeServer {
async fn main() {
simple_logger::SimpleLogger::new().init().unwrap();

let tservice = create_task(Arc::new(Box::new(FakeServer::new())));
let fakeserver = Box::new(FakeServer::new()) as Box<dyn Task + Send + Sync>;
let tservice = create_task(Arc::from(fakeserver));

let mut server = Server::new()
.bind("unix:///tmp/shim-proto-ttrpc-001")
Expand Down
3 changes: 2 additions & 1 deletion crates/shim-protos/examples/ttrpc-server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ impl Task for FakeServer {
fn main() {
simple_logger::SimpleLogger::new().init().unwrap();

let tservice = create_task(Arc::new(Box::new(FakeServer::new())));
let fakeserver = Box::new(FakeServer::new()) as Box<dyn Task + Send + Sync>;
let tservice = create_task(Arc::from(fakeserver));

let mut server = Server::new()
.bind("unix:///tmp/shim-proto-ttrpc-001")
Expand Down
10 changes: 6 additions & 4 deletions crates/shim-protos/tests/ttrpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ fn create_ttrpc_context() -> (

#[test]
fn test_task_method_num() {
let task = create_task(Arc::new(Box::new(FakeServer::new())));
let fakeserver = Box::new(FakeServer::new()) as Box<dyn Task + Send + Sync>;
let task = create_task(Arc::from(fakeserver));
assert_eq!(task.len(), 17);
}

Expand All @@ -96,7 +97,8 @@ fn test_create_task() {
request.set_timeout_nano(10000);
request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone()));

let task = create_task(Arc::new(Box::new(FakeServer::new())));
let fakeserver = Box::new(FakeServer::new()) as Box<dyn Task + Send + Sync>;
let task = create_task(Arc::from(fakeserver));
let create = task.get("/containerd.task.v2.Task/Create").unwrap();
create.handler(ctx, request).unwrap();

Expand Down Expand Up @@ -136,8 +138,8 @@ fn test_delete_task() {
request.set_payload(buf);
request.set_timeout_nano(10000);
request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone()));

let task = create_task(Arc::new(Box::new(FakeServer::new())));
let fakeserver = Box::new(FakeServer::new()) as Box<dyn Task + Send + Sync>;
let task = create_task(Arc::from(fakeserver));
let delete = task.get("/containerd.task.v2.Task/Delete").unwrap();
delete.handler(ctx, request).unwrap();

Expand Down
3 changes: 2 additions & 1 deletion crates/shim/src/asynchronous/publisher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ mod tests {
let barrier2 = barrier.clone();
let server_thread = tokio::spawn(async move {
let listener = UnixListener::bind(&path1).unwrap();
let service = create_events(Arc::new(Box::new(server)));
let sserver = Box::new(server) as Box<dyn Events + Sync + Send>;
let service = create_events(Arc::from(sserver));
let mut server = Server::new()
.set_domain_unix()
.add_listener(listener.as_raw_fd())
Expand Down

0 comments on commit e804152

Please sign in to comment.