Merge pull request #945 from Furisto/fix-ci-compilation

Fix CI compilation issues
youki-dev · May 27, 2022 · ee6b03f · ee6b03f
2 parents f6ef575 + cc8bab6
commit ee6b03f
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 26 deletions.
diff --git a/.github/workflows/integration_tests_validation.yaml b/.github/workflows/integration_tests_validation.yaml
@@ -26,7 +26,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        rust: [1.59.0, 1.61.0]
+        rust: [1.60.0, 1.61.0]
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -42,9 +42,9 @@ jobs:
           wget -q https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.amd64
           sudo mv runc.amd64 /usr/bin/runc
           sudo chmod 755 /usr/bin/runc
-      - name: Validate tests on runc
-        run: make validate-rust-tests
       - name: Build
         run: make release-build
+      - name: Validate tests on runc
+        run: make validate-rust-tests
       - name: Validate tests on youki
         run: make integration-test
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        rust: [1.59.0, 1.61.0]
+        rust: [1.60.0, 1.61.0]
         dirs: ${{ fromJSON(needs.changes.outputs.dirs) }}
     steps:
       - uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        rust: [1.59.0, 1.61.0]
+        rust: [1.60.0, 1.61.0]
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -77,7 +77,7 @@ jobs:
       - name: Toolchain setup
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.60.0
+          toolchain: 1.61.0
           override: true
           profile: minimal
           components: llvm-tools-preview
@@ -105,7 +105,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        rust: [1.59.0, 1.61.0]
+        rust: [1.60.0, 1.61.0]
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/rust-integration-tests/integration_test/Cargo.toml b/tests/rust-integration-tests/integration_test/Cargo.toml
@@ -14,7 +14,7 @@ nix = "0.24.1"
 num_cpus = "1.13"
 oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
 once_cell = "1.12.0"
-pnet = "0.29.0"
+pnet = "0.30.0"
 procfs = "0.12.0"
 rand = "0.8.5"
 serde = { version = "1.0", features = ["derive"] }