Merge branch 'master' into test-wasi-nomain

wasmerio · Jul 21, 2022 · 9cb18bf · 9cb18bf
2 parents f0a26b8 + e75e76d
commit 9cb18bf
Show file tree

Hide file tree

Showing 239 changed files with 12,743 additions and 12,712 deletions.
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -20,12 +20,11 @@ jobs:
       SCCACHE_AZURE_BLOB_CONTAINER: wasmerstoragesccacheblob
       SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.SCCACHE_AZURE_CONNECTION_STRING }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          override: true
+          toolchain: 1.59
       - name: Configure cargo data directory
         # After this point, all cargo registry and crate data is stored in
         # $GITHUB_WORKSPACE/.cargo_home. This allows us to cache only the files

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -81,7 +81,7 @@ jobs:
       SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.SCCACHE_AZURE_CONNECTION_STRING }}
       TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up libstdc++ on Linux
         if: matrix.build == 'linux-x64'
         run: |
@@ -93,10 +93,10 @@ jobs:
         run: |
             apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: 1.59
           target: ${{ matrix.target }}
-          override: true
       - uses: Swatinem/rust-cache@v1
         if: matrix.use_sccache != true
       - name: Install LLVM (macOS Apple Silicon)
@@ -195,11 +195,9 @@ jobs:
         run: |
           make build-wapm
       - name: Install Nightly Rust for Headless
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: 'nightly-2022-02-08'
           target: ${{ matrix.target }}
-          override: true
           components: "rust-src"
       - name: Build Minimal Wasmer Headless
         if: matrix.build != 'linux-musl-x64'
@@ -216,7 +214,9 @@ jobs:
           echo "incremental = false" >> Cargo.toml
           echo "codegen-units = 1" >> Cargo.toml
           echo "rpath = false" >> Cargo.toml
+          rustup override set nightly
           make build-wasmer-headless-minimal
+          rustup override set stable
       - name: Dist
         if: matrix.build != 'macos-arm64'
         run: |
@@ -241,11 +241,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
+          toolchain: 1.59
           target: aarch64-unknown-linux-gnu
-          override: true
       - name: Build cross image
         run: |
           docker build -t wasmer/aarch64 /home/runner/work/wasmer/wasmer/.github/cross-linux-aarch64/

diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -17,12 +17,11 @@ jobs:
     name: Coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          override: true
+          toolchain: 1.59
       - name: Install LLVM (Linux)
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz -L -o llvm.tar.xz

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -12,11 +12,11 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          override: true
+          toolchain: 1.59
       - name: Install LLVM
         shell: bash
         run: |

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -14,12 +14,11 @@ jobs:
     name: Code lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          override: true
+          toolchain: 1.59
           components: rustfmt, clippy
       - name: Install LLVM (Linux)
         run: |

diff --git a/.github/workflows/test-js.yaml b/.github/workflows/test-js.yaml
@@ -28,13 +28,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          override: true
+          toolchain: 1.59
 
       - name: Install NodeJS
         uses: actions/setup-node@v2

diff --git a/.github/workflows/test-sys.yaml b/.github/workflows/test-sys.yaml
@@ -53,6 +53,7 @@ jobs:
             run_test: true
             run_test_capi: true
             run_integration_tests: true
+            run_build_docs: true
             use_sccache: true
           - build: macos-x64
             os: macos-11
@@ -63,12 +64,14 @@ jobs:
             use_sccache: true
             run_integration_tests: true
             run_ios_tests: true
+            run_build_docs: false
           - build: macos-arm64
             os: macos-11.0
             target: aarch64-apple-darwin
             use_sccache: true
             run_test: false
             run_test_capi: false
+            run_build_docs: false
           - build: windows-x64
             os: windows-2019
             #target: x86_64-pc-windows-msvc commented because of bug in rust setup action
@@ -78,20 +81,22 @@ jobs:
             use_sccache: true
             run_test: true
             run_test_capi: false # We can't run yet the capi tests on Windows
+            run_build_docs: false
           - build: linux-musl-x64
             target: x86_64-unknown-linux-musl
             os: ubuntu-latest
             container: alpine:latest
             run_test: true
             run_test_capi: false # It can't run the capi tests because of a cc linker issue (`wasm_engine_new` is redefined)
             run_integration_tests: false
+            run_build_docs: false
             use_sccache: false
     container: ${{ matrix.container }}
     env:
       SCCACHE_AZURE_BLOB_CONTAINER: wasmerstoragesccacheblob
       SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.SCCACHE_AZURE_CONNECTION_STRING }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up libstdc++ on Linux
         if: matrix.build == 'linux-x64'
         run: |
@@ -103,10 +108,10 @@ jobs:
         run: |
             apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: 1.59
           target: ${{ matrix.target }}
-          override: true
       - uses: Swatinem/rust-cache@v1
         if: matrix.use_sccache != true
       - name: Install LLVM (Choco - Windows)
@@ -218,6 +223,10 @@ jobs:
         if: matrix.run_test_capi && matrix.os == 'windows-2019'
         run: |
           make test-capi
+      - name: Build Doc
+        if: matrix.run_build_docs
+        run: |
+          make package-docs
 
   audit:
     name: Audit

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,10 +9,13 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C
 ## **Unreleased**
 
 ### Changed
+- [#3017](https://github.com/wasmerio/wasmer/pull/3017) Fix typo in README.md
 - [#3003](https://github.com/wasmerio/wasmer/pull/3003) Remove RuntimeError::raise from public API
+- [#2999](https://github.com/wasmerio/wasmer/pull/2999) Allow `--invoke` CLI option for Emscripten files without a `main` function
 - [#2997](https://github.com/wasmerio/wasmer/pull/2997) Fix "run --invoke [function]" to behave the same as "run"
 - [#2946](https://github.com/wasmerio/wasmer/pull/2946) Remove dylib,staticlib engines in favor of a single Universal engine
 - [#2949](https://github.com/wasmerio/wasmer/pull/2949) Switch back to using custom LLVM builds on CI
+- #2892 Renamed `get_native_function` to `get_typed_function`, marked former as deprecated.
 
 ### Fixed
 - [#2963](https://github.com/wasmerio/wasmer/pull/2963) Remove accidental dependency on libwayland and libxcb in ClI