Skip to content

Commit

Permalink
chore: Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
bryantbiggs authored and mxpv committed Jul 30, 2024
1 parent 303b2e3 commit ab17df0
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 21 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:

- run: cargo clippy --all-targets -- -D warnings
- run: cargo clippy --all-targets --all-features -- -D warnings
# the shim has sync code that is not covered when running with --all-features

# the shim has sync code that is not covered when running with --all-features
- run: cargo clippy -p containerd-shim --all-targets -- -D warnings

- run: cargo doc --no-deps --features docs
Expand All @@ -49,10 +49,10 @@ jobs:
- run: ./scripts/install-protobuf.sh
shell: bash
- run: cargo check --examples --tests -p containerd-shim -p containerd-shim-protos -p containerd-client

- run: rustup toolchain install nightly --component rustfmt
- run: cargo +nightly fmt -p containerd-shim -p containerd-shim-protos -p containerd-client -- --check --files-with-diff

- run: cargo clippy -p containerd-shim -p containerd-shim-protos -- -D warnings
- run: cargo doc --no-deps -p containerd-shim -p containerd-shim-protos -p containerd-client
env:
Expand All @@ -76,8 +76,8 @@ jobs:
mkdir -p /tmp/dummy-xdr
sudo -E $(command -v cargo) test
sudo -E $(command -v cargo) test --all-features
# the shim has sync code that is not covered when running with --all-features
# the shim has sync code that is not covered when running with --all-features
sudo -E $(command -v cargo) test -p containerd-shim
if: ${{ !contains(matrix.os, 'windows') }}
env:
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
run: |
sudo -E PATH=$PATH make integration
working-directory: src/github.com/containerd/containerd

windows-integration:
name: Windows Integration
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -217,11 +217,11 @@ jobs:
$ErrorActionPreference = "Stop"
get-service containerd
$env:TTRPC_ADDRESS="\\.\pipe\containerd-containerd.ttrpc"
$env:TTRPC_ADDRESS="\\.\pipe\containerd-containerd.ttrpc"
# run the example
cargo run -p containerd-shim --example skeleton -- -namespace default -id 1234 -address "\\.\pipe\containerd-containerd" -publish-binary ./bin/containerd start
ps skeleton
# run the example
cargo run -p containerd-shim --example skeleton -- -namespace default -id 1234 -address "\\.\pipe\containerd-containerd" -publish-binary ./bin/containerd start
ps skeleton
cargo run -p containerd-shim-protos --example shim-proto-connect \\.\pipe\containerd-shim-17630016127144989388-pipe
$skeleton = get-process skeleton -ErrorAction SilentlyContinue
if ($skeleton) { exit 1 }
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,3 @@ jobs:
run: |
git tag $TAG
git push origin $TAG
2 changes: 1 addition & 1 deletion crates/client/examples/container_spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@
"/proc/sysrq-trigger"
]
}
}
}

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

2 changes: 1 addition & 1 deletion crates/runc-shim/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ tokio = { workspace = true, features = ["full"] }

[target.'cfg(target_os = "linux")'.dependencies]
cgroups-rs.workspace = true
nix = { workspace = true, features = ["event"] }
nix = { workspace = true, features = ["event"] }
2 changes: 1 addition & 1 deletion crates/runc-shim/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ In addition, we also run 100 pods and collect the total memory overhead.
| :----------------------------------------------------------- | :----------------- | :---------------- |
| containerd-shim-runc-v2 | 11.02MB | 1106.52MB |
| containerd-shim-runc-v2-rs(sync) | 3.45MB | 345.39MB |
| containerd-shim-runc-v2-rs(async, limited to 2 work threads) | 3.90MB | 396.83MB |
| containerd-shim-runc-v2-rs(async, limited to 2 work threads) | 3.90MB | 396.83MB |
4 changes: 2 additions & 2 deletions crates/runc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Crates.io](https://img.shields.io/crates/l/containerd-shim)](https://github.com/containerd/rust-extensions/blob/main/LICENSE)
[![CI](https://github.com/containerd/rust-extensions/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/containerd/rust-extensions/actions/workflows/ci.yml)

A crate for consuming the runc binary in your Rust applications, similar to [go-runc](https://github.com/containerd/go-runc) for Go.
A crate for consuming the runc binary in your Rust applications, similar to [go-runc](https://github.com/containerd/go-runc) for Go.
This crate is based on archived [rust-runc](https://github.com/pwFoo/rust-runc).

## Usage
Expand All @@ -29,7 +29,7 @@ async fn main() {
let opts = runc::options::CreateOpts::new()
.pid_file("/path/to/pid/file")
.no_pivot(true);
client.create("container-id", "path/to/bundle", Some(&opts)).unwrap();
}
```
Expand Down
2 changes: 1 addition & 1 deletion crates/shim-protos/vendor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Proto files are copy-pasted directly from upstream repos:
+ https://github.com/protocolbuffers/protobuf
+ https://github.com/gogo/protobuf
+ https://github.com/containerd/cgroups
+ https://github.com/microsoft/hcsshim
+ https://github.com/microsoft/hcsshim

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

2 changes: 1 addition & 1 deletion crates/snapshots/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ Server::builder()
.serve_with_incoming(incoming)
.await
.expect("Serve failed");
```
```

0 comments on commit ab17df0

Please sign in to comment.