Skip to content
Merged
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
17 changes: 15 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@main
uses: actions/checkout@v7

- name: Install Rust stable
run: |
Expand All @@ -29,6 +29,19 @@ jobs:
- name: Run clippy
run: cargo clippy --all --all-features -- -Dwarnings

msrv:
name: MSRV (Rust 1.89)
runs-on: ubuntu-22.04
steps:
- name: Checkout the source code
uses: actions/checkout@v7

- name: Install Rust 1.89
run: rustup toolchain install --profile minimal 1.89

- name: Check with MSRV
run: cargo +1.89 check --workspace --all-targets --all-features

test:
name: Test
runs-on: ${{ matrix.os }}
Expand All @@ -53,7 +66,7 @@ jobs:
docker_runtime: runsc
steps:
- name: Checkout the source code
uses: actions/checkout@main
uses: actions/checkout@v7

- name: Install Rust stable
run: |
Expand Down
12 changes: 6 additions & 6 deletions src/cmd/sandbox/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,10 @@ mod tests {
let candidates = parse(["7:memory:/docker/v1", "0::/docker/v2"]);

let chosen = HostCgroup::choose_usable(candidates, |path| {
path == "/sys/fs/cgroup/memory/docker/v1/memory.max_usage_in_bytes"
|| path == "/sys/fs/cgroup/memory/docker/v1/memory.oom_control"
|| path == "/sys/fs/cgroup/docker/v2/memory.peak"
|| path == "/sys/fs/cgroup/docker/v2/memory.events"
path == Path::new("/sys/fs/cgroup/memory/docker/v1/memory.max_usage_in_bytes")
|| path == Path::new("/sys/fs/cgroup/memory/docker/v1/memory.oom_control")
|| path == Path::new("/sys/fs/cgroup/docker/v2/memory.peak")
|| path == Path::new("/sys/fs/cgroup/docker/v2/memory.events")
})
.unwrap();

Expand All @@ -494,8 +494,8 @@ mod tests {
let candidates = parse(["7:memory:/docker/v1", "0::/docker/v2"]);

let chosen = HostCgroup::choose_usable(candidates, |path| {
path == "/sys/fs/cgroup/docker/v2/memory.peak"
|| path == "/sys/fs/cgroup/docker/v2/memory.events"
path == Path::new("/sys/fs/cgroup/docker/v2/memory.peak")
|| path == Path::new("/sys/fs/cgroup/docker/v2/memory.events")
})
.unwrap();

Expand Down