diff --git a/.github/workflows/integration_tests_validation.yaml b/.github/workflows/integration_tests_validation.yaml index 262c4d944..5ca69cfc3 100644 --- a/.github/workflows/integration_tests_validation.yaml +++ b/.github/workflows/integration_tests_validation.yaml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.57.0] + rust: [1.56.1, 1.58.0] steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8316efe5..7eb9a9447 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,14 +22,14 @@ jobs: ./crates/libcgroups: crates/libcgroups/** ./crates/libseccomp: crates/libseccomp/** ./crates/integration_test: crates/integration_test/** - ./runtimetest : runtimetest/** + ./runtimetest : runtimetest/** check: needs: [changes] if: ${{ !contains(needs.changes.outputs.dirs, '[]') }} runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.57.0] + rust: [1.56.1, 1.58.0] dirs: ${{ fromJSON(needs.changes.outputs.dirs) }} steps: - uses: actions/checkout@v2 @@ -52,7 +52,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.57.0] + rust: [1.56.1, 1.58.0] steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 @@ -102,7 +102,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.56.1, 1.57.0] + rust: [1.56.1, 1.58.0] steps: - uses: actions/checkout@v2 with: @@ -124,6 +124,6 @@ jobs: run: ./build.sh --release - uses: actions/setup-go@v2 with: - go-version: '1.11.0' + go-version: "1.11.0" - name: Run integration tests run: ./integration_test.sh diff --git a/crates/libcgroups/src/systemd/manager.rs b/crates/libcgroups/src/systemd/manager.rs index 72aeae69c..0d85269d4 100644 --- a/crates/libcgroups/src/systemd/manager.rs +++ b/crates/libcgroups/src/systemd/manager.rs @@ -232,7 +232,7 @@ impl Manager { let controllers: Vec = self .get_available_controllers(&full_boundary_path)? .into_iter() - .map(|c| format!("{}{}", "+", c.to_string())) + .map(|c| format!("{}{}", "+", c)) .collect(); Self::write_controllers(&full_boundary_path, &controllers)?; diff --git a/crates/libcgroups/src/v2/manager.rs b/crates/libcgroups/src/v2/manager.rs index 7465bb4b2..3baeb86a6 100644 --- a/crates/libcgroups/src/v2/manager.rs +++ b/crates/libcgroups/src/v2/manager.rs @@ -52,7 +52,7 @@ impl Manager { fn create_unified_cgroup(&self, pid: Pid) -> Result<()> { let controllers: Vec = util::get_available_controllers(&self.root_path)? .iter() - .map(|c| format!("{}{}", "+", c.to_string())) + .map(|c| format!("{}{}", "+", c)) .collect(); Self::write_controllers(&self.root_path, &controllers)?;