chore: bump rust version to 1.8.4 and update deps to reslove cargo de…

…ny check failures Signed-off-by: Yang Kaiyong <[email protected]>
dragonflyoss · Jan 17, 2025 · 7a3a483 · 7a3a483
1 parent f60e40a
commit 7a3a483
Show file tree

Hide file tree

Showing 49 changed files with 981 additions and 828 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
       run: |
         declare -A rust_target_map=( ["amd64"]="x86_64-unknown-linux-musl" ["arm64"]="aarch64-unknown-linux-musl" ["ppc64le"]="powerpc64le-unknown-linux-gnu" ["riscv64"]="riscv64gc-unknown-linux-gnu")
         RUST_TARGET=${rust_target_map[${{ matrix.arch }}]}
-        cargo install --locked --version 0.2.4 cross
+        cargo install --locked --version 0.2.5 cross
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
         sudo mv target/$RUST_TARGET/release/nydusd nydusd
         sudo mv target/$RUST_TARGET/release/nydus-image .
@@ -67,7 +67,7 @@ jobs:
         else
           RUST_TARGET="aarch64-apple-darwin"
         fi
-        cargo install --version 0.2.4 cross
+        cargo install --version 0.2.5 cross
         rustup target add ${RUST_TARGET}
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
         sudo mv target/$RUST_TARGET/release/nydusd nydusd

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [amd64, arm64, ppc64le, riscv64]
+        arch: [amd64, arm64, ppc64le,riscv64]
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -80,7 +80,7 @@ jobs:
       run: |
         declare -A rust_target_map=( ["amd64"]="x86_64-unknown-linux-musl" ["arm64"]="aarch64-unknown-linux-musl" ["ppc64le"]="powerpc64le-unknown-linux-gnu" ["riscv64"]="riscv64gc-unknown-linux-gnu")
         RUST_TARGET=${rust_target_map[${{ matrix.arch }}]}
-        cargo install --locked --version 0.2.4 cross
+        cargo install --locked --version 0.2.5 cross
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
         sudo mv target/$RUST_TARGET/release/nydusd .
         sudo mv target/$RUST_TARGET/release/nydus-image .
@@ -114,7 +114,7 @@ jobs:
         else
           RUST_TARGET="aarch64-apple-darwin"
         fi
-        cargo install --version 0.2.4 cross
+        cargo install --version 0.2.5 cross
         rustup target add ${RUST_TARGET}
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release