From 748af62152ecfc5d0dc8197435dca5372062d247 Mon Sep 17 00:00:00 2001 From: csh <458761603@qq.com> Date: Mon, 2 Dec 2024 20:04:28 +0800 Subject: [PATCH 1/5] [Bump] `wasmedge-sys` to `0.19.3` Signed-off-by: csh <458761603@qq.com> --- crates/wasmedge-sys/Cargo.toml | 2 +- crates/wasmedge-sys/build.rs | 18 +++++++++--------- crates/wasmedge-sys/src/lib.rs | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/crates/wasmedge-sys/Cargo.toml b/crates/wasmedge-sys/Cargo.toml index 711c17bab..f73eadbc9 100644 --- a/crates/wasmedge-sys/Cargo.toml +++ b/crates/wasmedge-sys/Cargo.toml @@ -10,7 +10,7 @@ links = "wasmedge" name = "wasmedge-sys" readme = "README.md" repository = "https://github.com/WasmEdge/wasmedge-rust-sdk" -version = "0.19.2" +version = "0.19.3" [dependencies] log = "0.4" diff --git a/crates/wasmedge-sys/build.rs b/crates/wasmedge-sys/build.rs index 15b7bf2fd..88e982ced 100644 --- a/crates/wasmedge-sys/build.rs +++ b/crates/wasmedge-sys/build.rs @@ -9,7 +9,7 @@ use build_standalone::*; use crate::build_paths::AsPath; -const WASMEDGE_RELEASE_VERSION: &str = "0.14.0"; +const WASMEDGE_RELEASE_VERSION: &str = "0.14.1"; const REMOTE_ARCHIVES: phf::Map<&'static str, (&'static str, &'static str)> = phf_map! { // The key is: {os}/{arch}[/{libc}][/static] // * The libc abi is only added on linux. @@ -18,14 +18,14 @@ const REMOTE_ARCHIVES: phf::Map<&'static str, (&'static str, &'static str)> = ph // The value is a tuple containing the sha256sum of the archive, and the platform slug as it appears in the archive name: // * The archive name is WasmEdge-{version}-{slug}.tar.gz - "macos/aarch64" => ("4f2f34545a97768e28700099ac9cbb18e7b434779d237de860324de400922546", "darwin_arm64"), - "macos/x86_64" => ("03c5d77be63ecad54ed33a1885f170bc854246ed8f9ae8e366b114bc8c0c2422", "darwin_x86_64"), - "linux/aarch64/gnu" => ("6136c42066cdd9a96170285af2613dc00f262f5758a03d7afb3ab12a36363c79", "manylinux2014_aarch64"), - "linux/x86_64/gnu" => ("73b3892f94c143dc09d53415c6848bb8e87206a1f614fd0edfc89957a0f1b027", "manylinux2014_x86_64"), - "linux/aarch64/gnu/static" => ("ca054e27cd253a91850641919e7911ec967b9eee6b83bc1c66ae6ed537d992d7", "debian11_aarch64_static"), - "linux/x86_64/gnu/static" => ("fd8829abdc471f13e8fbbe75630e30a498773ebe620af425cf153d7e2b2cabbf", "debian11_x86_64_static"), - "linux/aarch64/musl/static" => ("67365eeaaa7d8a4da4180b88ac33650e09df5e8ce84e8386bca9c38682ab21ef", "alpine3.16_aarch64_static"), - "linux/x86_64/musl/static" => ("cc9de0d11fa105c990a73db9e7076a986e9850dbd9f7e01fbc3a4ad01c739c8b", "alpine3.16_x86_64_static"), + "macos/aarch64" => ("38dd10f4e78d339be91e0c3501055d4dad9bf08c3dc648e07a30df9bea2d6c4a", "darwin_arm64"), + "macos/x86_64" => ("96d01cf083d4f7e1c55683dc4b60acca6d8517ad901e2d7b4b5d64ca9a6532e0", "darwin_x86_64"), + "linux/aarch64/gnu" => ("d5ac5c2405ff8a878558379740498e5fe4b126fe746eac585f7efa9bb7f32e28", "manylinux2014_aarch64"), + "linux/x86_64/gnu" => ("a82f9fb01a6a6f1dfbd1cb069dc96d116f22c15cdb01207a5d0e65096055d092", "manylinux2014_x86_64"), + "linux/aarch64/gnu/static" => ("073117b8f330ee470cdc574e1c1348dc6775e3b5c2b4662a820d9b4922342662", "debian11_aarch64_static"), + "linux/x86_64/gnu/static" => ("2ad4d84d32fcfadc141fb6b985bad273de5379a33da813ec108efa10b4cb0dc7", "debian11_x86_64_static"), + "linux/aarch64/musl/static" => ("a06a4f10ba960893896331eb3ff7146c13afbfba09ea305f4b56213f2c7d0a93", "alpine3.16_aarch64_static"), + "linux/x86_64/musl/static" => ("b3652a010ac0703177651ce46d5e93cc6acf6bbb8d20ddcb86d26a189775cc00", "alpine3.16_x86_64_static"), }; lazy_static! { diff --git a/crates/wasmedge-sys/src/lib.rs b/crates/wasmedge-sys/src/lib.rs index 8cba6adc2..e8aa27771 100644 --- a/crates/wasmedge-sys/src/lib.rs +++ b/crates/wasmedge-sys/src/lib.rs @@ -19,6 +19,8 @@ //! //! | wasmedge-sdk | WasmEdge lib | wasmedge-sys | wasmedge-types| wasmedge-macro| async-wasi| //! | :-----------: | :-----------: | :-----------: | :-----------: | :-----------: | :-------: | +//! | 0.14.0+ | 0.14.1 | 0.19.3 | 0.6.0 | 0.6.1 | 0.2.1 | +//! | 0.14.0+ | 0.14.0 | 0.19.2 | 0.6.0 | 0.6.1 | 0.2.1 | //! | 0.13.2 | 0.13.5 | 0.17.5 | 0.4.4 | 0.6.1 | 0.1.0 | //! | 0.13.1 | 0.13.5 | 0.17.4 | 0.4.4 | 0.6.1 | 0.1.0 | //! | 0.13.0 | 0.13.5 | 0.17.3 | 0.4.4 | 0.6.1 | 0.1.0 | From 2dcce56cededabade4cfa6adb6159312cfcf21d7 Mon Sep 17 00:00:00 2001 From: csh <458761603@qq.com> Date: Mon, 2 Dec 2024 20:21:16 +0800 Subject: [PATCH 2/5] [CI] Update rust version & remove `+nightly` Signed-off-by: csh <458761603@qq.com> --- .github/workflows/ci-build-release-lib.yml | 80 ++++++++------------ .github/workflows/ci-build.yml | 80 ++++++++------------ .github/workflows/publish-async-api-docs.yml | 6 +- .github/workflows/release-async-wasi.yml | 4 +- .github/workflows/release-wasmedge-macro.yml | 4 +- .github/workflows/release-wasmedge-sdk.yml | 6 +- .github/workflows/release-wasmedge-sys.yml | 6 +- .github/workflows/release-wasmedge-types.yml | 4 +- .github/workflows/rust-static-lib.yml | 2 +- .github/workflows/standalone.yml | 8 +- 10 files changed, 81 insertions(+), 119 deletions(-) diff --git a/.github/workflows/ci-build-release-lib.yml b/.github/workflows/ci-build-release-lib.yml index 18115701c..b7ef07fcd 100644 --- a/.github/workflows/ci-build-release-lib.yml +++ b/.github/workflows/ci-build-release-lib.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-20.04] - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] container: image: wasmedge/wasmedge:ubuntu-build-clang @@ -40,28 +40,24 @@ jobs: curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- --plugins wasi_crypto ldconfig - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Rustfmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy check run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings + cargo clippy -V + cargo clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Clippy check for async feature run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Build Async-Hello for Testing working-directory: examples/wasmedge-sys @@ -85,7 +81,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] container: image: fedora:latest @@ -103,28 +99,24 @@ jobs: curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- --plugins wasi_crypto ldconfig - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Rustfmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy check run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings + cargo clippy -V + cargo clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Clippy check for async feature run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Build Async-Hello for Testing working-directory: examples/wasmedge-sys @@ -149,7 +141,7 @@ jobs: strategy: matrix: os: [macos-12, macos-13] - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] steps: - name: Checkout sources @@ -161,23 +153,19 @@ jobs: run: | curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- --plugins wasi_crypto - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Run cargo fmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,ffi -- -D warnings - name: Test Rust Bindings run: | @@ -189,7 +177,7 @@ jobs: runs-on: windows-2022 strategy: matrix: - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] env: WASMEDGE_DIR: ${{ github.workspace }}\WasmEdge WASMEDGE_BUILD_DIR: ${{ github.workspace }}\WasmEdge\build @@ -234,26 +222,22 @@ jobs: cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release "-DCMAKE_SYSTEM_VERSION=$cmake_sys_version" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL "-DLLVM_DIR=$llvm_dir" -DWASMEDGE_BUILD_PACKAGE="ZIP" . cmake --build build - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Rustfmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy run: | $vsPath = (vswhere -latest -property installationPath) Import-Module (Join-Path $vsPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll") Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64 -winsdk=10.0.19041.0" - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,ffi -- -D warnings - name: Test Rust Bindings run: | diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d4dfd4662..e329078cc 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-20.04] - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] container: image: wasmedge/wasmedge:ubuntu-build-clang @@ -53,28 +53,24 @@ jobs: cmake --install build ldconfig - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Rustfmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy check run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings + cargo clippy -V + cargo clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Clippy check for async feature run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Build Async-Hello for Testing working-directory: examples/wasmedge-sys @@ -96,7 +92,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] container: image: fedora:latest @@ -121,28 +117,24 @@ jobs: cmake --build build cmake --install build - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Rustfmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy check run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings + cargo clippy -V + cargo clippy --lib --examples --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Clippy check for async feature run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi -- -D warnings - name: Build Async-Hello for Testing working-directory: examples/wasmedge-sys @@ -173,7 +165,7 @@ jobs: strategy: matrix: os: [macos-12, macos-13] - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] steps: - name: Checkout sources @@ -201,23 +193,19 @@ jobs: cmake --build build cmake --install build - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Run cargo fmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy run: | - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,ffi -- -D warnings - name: Test Rust Bindings run: | @@ -228,7 +216,7 @@ jobs: runs-on: windows-2022 strategy: matrix: - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] env: WASMEDGE_DIR: ${{ github.workspace }}\WasmEdge WASMEDGE_BUILD_DIR: ${{ github.workspace }}\WasmEdge\build @@ -271,26 +259,22 @@ jobs: cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release "-DCMAKE_SYSTEM_VERSION=$cmake_sys_version" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL "-DLLVM_DIR=$llvm_dir" -DWASMEDGE_BUILD_PACKAGE="ZIP" . cmake --build build - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + toolchain: ${{ matrix.rust }} - name: Rustfmt - run: cargo +nightly fmt --all -- --check + run: cargo fmt --all -- --check - name: Clippy run: | $vsPath = (vswhere -latest -property installationPath) Import-Module (Join-Path $vsPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll") Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64 -winsdk=10.0.19041.0" - cargo +nightly clippy -V - cargo +nightly clippy --lib --examples --features aot,ffi -- -D warnings - - - name: Install Rust-stable - uses: dtolnay/rust-toolchain@stable - with: - toolchain: ${{ matrix.rust }} + cargo clippy -V + cargo clippy --lib --examples --features aot,ffi -- -D warnings - name: Test Rust Bindings run: | diff --git a/.github/workflows/publish-async-api-docs.yml b/.github/workflows/publish-async-api-docs.yml index f7cba6a52..718078d2c 100644 --- a/.github/workflows/publish-async-api-docs.yml +++ b/.github/workflows/publish-async-api-docs.yml @@ -36,12 +36,12 @@ jobs: curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- -v ${{ inputs.wasmedge_version }} -p /usr/local ldconfig - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable - name: Build Async API document run: | - RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc -p wasmedge-sdk --workspace --no-deps --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi --target-dir=./target + RUSTDOCFLAGS="--cfg docsrs" cargo doc -p wasmedge-sdk --workspace --no-deps --features aot,async,wasi_crypto,wasi_nn,wasmedge_process,ffi --target-dir=./target - name: Deploy Async API document if: github.ref == 'refs/heads/main' diff --git a/.github/workflows/release-async-wasi.yml b/.github/workflows/release-async-wasi.yml index 0b5cf51a5..9af0ac94d 100644 --- a/.github/workflows/release-async-wasi.yml +++ b/.github/workflows/release-async-wasi.yml @@ -19,10 +19,8 @@ jobs: with: fetch-depth: 0 - - name: Install Rust v1.75 + - name: Install Rust-stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.75 - name: Dry run cargo publish env: diff --git a/.github/workflows/release-wasmedge-macro.yml b/.github/workflows/release-wasmedge-macro.yml index a2ce15598..c8d36f381 100644 --- a/.github/workflows/release-wasmedge-macro.yml +++ b/.github/workflows/release-wasmedge-macro.yml @@ -19,10 +19,8 @@ jobs: with: fetch-depth: 0 - - name: Install Rust v1.78 + - name: Install Rust-stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.78 - name: Dry run cargo publish env: diff --git a/.github/workflows/release-wasmedge-sdk.yml b/.github/workflows/release-wasmedge-sdk.yml index e0e7b68b4..91a381eb8 100644 --- a/.github/workflows/release-wasmedge-sdk.yml +++ b/.github/workflows/release-wasmedge-sdk.yml @@ -36,8 +36,8 @@ jobs: curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- -v ${{ inputs.wasmedge_version }} -p /usr/local ldconfig - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable - name: Dry run cargo publish env: @@ -57,7 +57,7 @@ jobs: - name: Build API document run: | - RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc -p wasmedge-sdk --workspace --no-deps --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi --target-dir=./target + RUSTDOCFLAGS="--cfg docsrs" cargo doc -p wasmedge-sdk --workspace --no-deps --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi --target-dir=./target - name: Deploy API document if: github.ref == 'refs/heads/main' diff --git a/.github/workflows/release-wasmedge-sys.yml b/.github/workflows/release-wasmedge-sys.yml index 25eac8dc4..fbf370c73 100644 --- a/.github/workflows/release-wasmedge-sys.yml +++ b/.github/workflows/release-wasmedge-sys.yml @@ -36,8 +36,8 @@ jobs: curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- -v ${{ inputs.wasmedge_version }} -p /usr/local ldconfig - - name: Install Rust-nightly - uses: dtolnay/rust-toolchain@nightly + - name: Install Rust-stable + uses: dtolnay/rust-toolchain@stable - name: Dry run cargo publish env: @@ -57,7 +57,7 @@ jobs: - name: Build API document run: | - RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc -p wasmedge-sys --workspace --no-deps --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi --target-dir=./target + RUSTDOCFLAGS="--cfg docsrs" cargo doc -p wasmedge-sys --workspace --no-deps --features aot,wasi_crypto,wasi_nn,wasmedge_process,ffi --target-dir=./target - name: Deploy API document if: github.ref == 'refs/heads/main' diff --git a/.github/workflows/release-wasmedge-types.yml b/.github/workflows/release-wasmedge-types.yml index 8547f3ffb..6659af31c 100644 --- a/.github/workflows/release-wasmedge-types.yml +++ b/.github/workflows/release-wasmedge-types.yml @@ -19,10 +19,8 @@ jobs: with: fetch-depth: 0 - - name: Install Rust v1.78 + - name: Install Rust-stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.78 - name: Dry run cargo publish env: diff --git a/.github/workflows/rust-static-lib.yml b/.github/workflows/rust-static-lib.yml index 427d1c610..fd14ff887 100644 --- a/.github/workflows/rust-static-lib.yml +++ b/.github/workflows/rust-static-lib.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] container: image: wasmedge/wasmedge:ubuntu-build-clang diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml index 33553492f..336e817c5 100644 --- a/.github/workflows/standalone.yml +++ b/.github/workflows/standalone.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] steps: - name: Checkout WasmEdge Rust SDK @@ -57,7 +57,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] steps: - name: Checkout WasmEdge Rust SDK @@ -92,7 +92,7 @@ jobs: strategy: matrix: os: [macos-12, macos-13] - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] steps: - name: Checkout sources @@ -121,7 +121,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.78, 1.77, 1.76] + rust: [1.83, 1.82, 1.81] container: image: fedora:latest From d26526618db5f8098c196390cfdfa201e269d373 Mon Sep 17 00:00:00 2001 From: csh <458761603@qq.com> Date: Mon, 2 Dec 2024 20:28:22 +0800 Subject: [PATCH 3/5] [CI] fix wasmedge-sys clippy Signed-off-by: csh <458761603@qq.com> --- crates/wasmedge-sys/src/ast_module.rs | 6 +++--- crates/wasmedge-sys/src/async/fiber.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/wasmedge-sys/src/ast_module.rs b/crates/wasmedge-sys/src/ast_module.rs index 01d52f1d4..fd9f4f5c1 100644 --- a/crates/wasmedge-sys/src/ast_module.rs +++ b/crates/wasmedge-sys/src/ast_module.rs @@ -89,14 +89,14 @@ pub struct ImportType<'module> { pub(crate) inner: InnerImportType, pub(crate) module: &'module Module, } -impl<'module> Drop for ImportType<'module> { +impl Drop for ImportType<'_> { fn drop(&mut self) { if !self.inner.0.is_null() { self.inner.0 = std::ptr::null(); } } } -impl<'module> ImportType<'module> { +impl ImportType<'_> { /// Returns the type of this import. pub fn ty(&self) -> WasmEdgeResult { let ty = unsafe { ffi::WasmEdge_ImportTypeGetExternalType(self.inner.0) }; @@ -257,7 +257,7 @@ pub struct ExportType<'module> { pub(crate) module: &'module Module, } -impl<'module> ExportType<'module> { +impl ExportType<'_> { /// Returns the type of this export. pub fn ty(&self) -> WasmEdgeResult { let ty = unsafe { ffi::WasmEdge_ExportTypeGetExternalType(self.inner.0) }; diff --git a/crates/wasmedge-sys/src/async/fiber.rs b/crates/wasmedge-sys/src/async/fiber.rs index 9380e2d00..bd0146841 100644 --- a/crates/wasmedge-sys/src/async/fiber.rs +++ b/crates/wasmedge-sys/src/async/fiber.rs @@ -70,7 +70,7 @@ impl<'a> FiberFuture<'a> { ASYNC_CX.set(&async_cx, || self.fiber.resume(val)) } } -impl<'a> Future for FiberFuture<'a> { +impl Future for FiberFuture<'_> { type Output = Result<(), ()>; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { unsafe { @@ -164,7 +164,7 @@ impl<'a> TimeoutFiberFuture<'a> { } } -impl<'a> Future for TimeoutFiberFuture<'a> { +impl Future for TimeoutFiberFuture<'_> { type Output = Result<(), ()>; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { unsafe { From c8df8916096317f60ce93a6a2d797e4b20c8d3ab Mon Sep 17 00:00:00 2001 From: csh <458761603@qq.com> Date: Mon, 2 Dec 2024 20:29:33 +0800 Subject: [PATCH 4/5] [CI] fix wasmedge-sdk clippy Signed-off-by: csh <458761603@qq.com> --- src/module.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/module.rs b/src/module.rs index e278ce53e..e87a0e9d7 100644 --- a/src/module.rs +++ b/src/module.rs @@ -122,7 +122,7 @@ pub struct ImportType<'module> { inner: sys::ImportType<'module>, _marker: PhantomData<&'module Module>, } -impl<'module> ImportType<'module> { +impl ImportType<'_> { /// Returns the imported name of the WasmEdge instance. pub fn name(&self) -> Cow<'_, str> { self.inner.name() @@ -146,7 +146,7 @@ pub struct ExportType<'module> { inner: sys::ExportType<'module>, _marker: PhantomData<&'module Module>, } -impl<'module> ExportType<'module> { +impl ExportType<'_> { /// Returns the exported name of the WasmEdge instance. pub fn name(&self) -> Cow<'_, str> { self.inner.name() From 53b83d1ec5e76bf06f2a082e9220f8f70ae5a1f0 Mon Sep 17 00:00:00 2001 From: csh <458761603@qq.com> Date: Mon, 2 Dec 2024 21:33:41 +0800 Subject: [PATCH 5/5] [CI] update macos to 14 & 13 Signed-off-by: csh <458761603@qq.com> --- .github/workflows/ci-build-release-lib.yml | 2 +- .github/workflows/ci-build.yml | 2 +- .github/workflows/standalone.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build-release-lib.yml b/.github/workflows/ci-build-release-lib.yml index b7ef07fcd..08092a80f 100644 --- a/.github/workflows/ci-build-release-lib.yml +++ b/.github/workflows/ci-build-release-lib.yml @@ -140,7 +140,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-12, macos-13] + os: [macos-14, macos-13] rust: [1.83, 1.82, 1.81] steps: diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e329078cc..c0b17a6e6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -164,7 +164,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-12, macos-13] + os: [macos-14, macos-13] rust: [1.83, 1.82, 1.81] steps: diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml index 336e817c5..220432b0b 100644 --- a/.github/workflows/standalone.yml +++ b/.github/workflows/standalone.yml @@ -91,7 +91,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-12, macos-13] + os: [macos-14, macos-13] rust: [1.83, 1.82, 1.81] steps: