Experimental: Add support for WASMI

.github/cross-linux-riscv64/Dockerfile

@@ -28,7 +28,7 @@ RUN apt-get update  && \
 # install rust tools
 RUN curl --proto "=https" --tlsv1.2 --retry 3 -sSfL https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
-RUN rustup -v toolchain install 1.78
+RUN rustup -v toolchain install 1.79
 # add docker the manual way
 COPY install_docker.sh /
 RUN /install_docker.sh
@@ -61,7 +61,7 @@ ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc
     RUST_TEST_THREADS=1 \
     PKG_CONFIG_PATH="/usr/lib/riscv64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"
 
-RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.78-x86_64-unknown-linux-gnu
+RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.79-x86_64-unknown-linux-gnu
 
 #compile libssl-dev for riscv64!
 COPY build_openssl.sh /

.github/workflows/benchmark.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.78"
+  MSRV: "1.79"
 
 jobs:
   run_benchmark:

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Builds
 env:
   RUST_BACKTRACE: 1
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.78"
+  MSRV: "1.79"
 
 on:
   push:

.github/workflows/cloudcompiler.yaml

@@ -2,7 +2,7 @@ name: Release cloudcompiler.wasm
 
 env:
   RUST_BACKTRACE: 1
-  MSRV: "1.78"
+  MSRV: "1.79"
 
 on:
   push:

.github/workflows/documentation.yaml

@@ -8,7 +8,7 @@ on:
       - 'lib/**'
 
 env:
-  MSRV: "1.78"
+  MSRV: "1.79"
 
 jobs:
   documentation:

.github/workflows/test.yaml

@@ -24,7 +24,7 @@ env:
   # Rust, but it's not stable on 1.69 yet. By explicitly setting the protocol we
   # can override that behaviour
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.78"
+  MSRV: "1.79"
   NEXTEST_PROFILE: "ci"
   RUSTUP_WINDOWS_PATH_ADD_BIN: 1
   WASI_SDK_VERSION: "22"
@@ -206,6 +206,54 @@ jobs:
       - name: make build-wasmer-jsc
         run: make build-wasmer-jsc
 
+  test_interpreter_api:
+    name: ${{ matrix.build-what.name }} on ${{ matrix.metadata.build }}
+    runs-on:  ${{ matrix.metadata.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        build-what: [
+          {
+            key: wamr,
+            build-cmd: 'make test-wamr-api',
+            name: 'Test API for wamr feature'
+          },
+          {
+            key: wasmi,
+            build-cmd: 'make test-wasmi-api',
+            name: 'Test API for wasmi feature'
+          }
+        ]
+        metadata: [
+          {
+            build: linux-x64,
+            os: ubuntu-22.04,
+          },
+          {
+            build: macos-arm,
+            os: macos-14,
+          },
+          {
+            build: windows-x64,
+            os: windows-2022,
+          }
+        ]
+    container: ${{ matrix.metadata.container }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ env.MSRV }}
+      - name: Install Nextest
+        uses: taiki-e/install-action@nextest
+      - name: Test WAMR API 
+        if: ${{ matrix.build-what.key == 'wamr' }}
+        run: ${{ matrix.build-what.build-cmd }}
+
+      - name: Test wasmi API 
+        if: ${{ matrix.build-what.key == 'wasmi' }}
+        run: ${{ matrix.build-what.build-cmd }}
+
   test_build_docs_rs:
     name: Test build docs rs
     runs-on: ubuntu-22.04
@@ -858,6 +906,30 @@ jobs:
           CARGO_TARGET: ${{ matrix.target }}
           WAPM_DEV_TOKEN: ${{ secrets.WAPM_DEV_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Test CLI integration (WAMR) 
+        shell: bash
+        run: |
+          export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}
+          export WASMER_DIR=`pwd`/package && make test-integration-cli-wamr-ci
+        env:
+          TARGET: ${{ matrix.target }}
+          TARGET_DIR: target/${{ matrix.target }}/release
+          CARGO_TARGET: ${{ matrix.target }}
+          WAPM_DEV_TOKEN: ${{ secrets.WAPM_DEV_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Test CLI integration (WASMI) 
+        shell: bash
+        run: |
+          export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}
+          export WASMER_DIR=`pwd`/package && make test-integration-cli-wasmi-ci
+        env:
+          TARGET: ${{ matrix.target }}
+          TARGET_DIR: target/${{ matrix.target }}/release
+          CARGO_TARGET: ${{ matrix.target }}
+          WAPM_DEV_TOKEN: ${{ secrets.WAPM_DEV_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 
   # there is another set of integration tests in 'wasmer-integration-tests' repo. Run those
   test-wasmer-integration-tests:

Cargo.toml

@@ -14,7 +14,7 @@ version.workspace = true
 [dependencies]
 wasmer = { version = "=4.3.7", path = "lib/api", default-features = false }
 wasmer-compiler = { version = "=4.3.7", path = "lib/compiler", features = [
-    "compiler",
+	"compiler",
 
 ], optional = true }
 wasmer-compiler-cranelift = { version = "=4.3.7", path = "lib/compiler-cranelift", optional = true }
@@ -105,14 +105,16 @@ hyper = "1"
 reqwest = { version = "0.12.0", default-features = false }
 enumset = "1.1.0"
 memoffset = "0.9.0"
-wasmparser = { version = "0.216.0", default-features = false, features = ["validate"]}
+wasmparser = { version = "0.216.0", default-features = false, features = [
+	"validate",
+] }
 rkyv = { version = "0.7.40", features = ["indexmap", "validation", "strict"] }
 memmap2 = { version = "0.6.2" }
 toml = { version = "0.5.9", features = ["preserve_order"] }
 indexmap = "2"
 serde_yaml = "0.9.34"
 libc = { version = "^0.2", default-features = false }
-gimli = { version = "0.28.1"}
+gimli = { version = "0.28.1" }
 
 [build-dependencies]
 test-generator = { path = "tests/lib/test-generator" }
@@ -123,9 +125,9 @@ rustc_version = "0.4"
 
 [dev-dependencies]
 wasmer = { version = "=4.3.7", path = "lib/api", features = [
-    "compiler",
-    "singlepass",
-    "sys",
+	"compiler",
+	"singlepass",
+	"sys",
 ] }
 anyhow = "1.0"
 criterion = { version = "0.5", default-features = false }
@@ -163,6 +165,7 @@ default = [
 backend = []
 jsc = ["wasmer/jsc", "backend", "wat", "wasmer/std"]
 wamr = ["wasmer/wamr"]
+wasmi = ["wasmer/wasmi"]
 engine = ["universal"]
 universal = []
 cache = ["wasmer-cache"]