Update the WAMR repo to official and fix format

Signed-off-by: Le Yao <[email protected]>
envoyproxy · Apr 26, 2021 · abde7d6 · abde7d6
1 parent 4d49bea
commit abde7d6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/api/envoy/extensions/wasm/v3/wasm.proto b/api/envoy/extensions/wasm/v3/wasm.proto
@@ -62,6 +62,11 @@ message VmConfig {
   //
   // **envoy.wasm.runtime.v8**: `V8 <https://v8.dev/>`_-based WebAssembly runtime.
   //
+  // .. _extension_envoy.wasm.runtime.wamr:
+  //
+  // **envoy.wasm.runtime.wamr**: `WAMR <https://github.com/bytecodealliance/wasm-micro-runtime/>`_-based WebAssembly runtime.
+  // This runtime is not enabled in the official build.
+  //
   // .. _extension_envoy.wasm.runtime.wavm:
   //
   // **envoy.wasm.runtime.wavm**: `WAVM <https://wavm.github.io/>`_-based WebAssembly runtime.

diff --git a/bazel/external/wamr.BUILD b/bazel/external/wamr.BUILD
@@ -13,13 +13,11 @@ filegroup(
 cmake_external(
     name = "libiwasm",
     cache_entries = {
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "On",
         "WAMR_BUILD_AOT": "0",
         "WAMR_BUILD_SIMD": "0",
         "WAMR_BUILD_MULTI_MODULE": "1",
         "WAMR_BUILD_LIBC_WASI": "0",
     },
     lib_source = ":srcs",
     static_libraries = ["libvmlib.a"],
-    working_directory = "product-mini/platforms/linux",
 )
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -708,11 +708,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Webassembly Micro Runtime",
         project_desc = "A standalone runtime with a small footprint for WebAssembly",
         project_url = "https://github.com/bytecodealliance/wasm-micro-runtime",
-        version = "0.1-beta",
-        sha256 = "e364c84654121e3b303d380e017540bb1b330845327db3f4d51fa353492ec04f",
+        version = "67fa1602031f5b86d195a3b1d02d331fcb70f299",
+        sha256 = "1d219d4121badc23b0743af2e7dc7e04348ace309748541deba897709f2d90b6",
         strip_prefix = "wasm-micro-runtime-{version}",
-        urls = ["https://github.com/lum1n0us/wasm-micro-runtime/archive/refs/tags/v{version}.tar.gz"],
-        release_date = "2020-04-11",
+        urls = ["https://github.com/bytecodealliance/wasm-micro-runtime/archive/{version}.tar.gz"],
+        release_date = "2021-04-20",
         use_category = ["dataplane_ext"],
         extensions = ["envoy.wasm.runtime.wamr"],
         cpe = "N/A",
@@ -979,7 +979,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
             "envoy.wasm.runtime.wavm",
             "envoy.wasm.runtime.wasmtime",
         ],
-        release_date = "2021-04-08",
+        release_date = "2021-04-19",
         cpe = "N/A",
     ),
     proxy_wasm_rust_sdk = dict(

diff --git a/docs/root/configuration/other_features/wasm.rst b/docs/root/configuration/other_features/wasm.rst
@@ -10,12 +10,11 @@ The following runtimes are supported by Envoy:
   :widths: 1, 2
 
   envoy.wasm.runtime.v8, "`V8 <https://v8.dev>`_-based runtime"
-  envoy.wasm.runtime.wamr, "`WAMR <https://github.com/bytecodealliance/wasm-micro-runtime>`_ runtime"
   envoy.wasm.runtime.wasmtime, "`Wasmtime <https://github.com/bytecodealliance/wasmtime>`_ runtime"
   envoy.wasm.runtime.wavm, "`WAVM <https://github.com/WAVM/WAVM>`_ runtime"
   envoy.wasm.runtime.null, "Compiled modules linked into Envoy"
 
-Wasmtime, WAMR and WAVM runtimes are not included in Envoy release image by default.
+Wasmtime and WAVM runtimes are not included in Envoy release image by default.
 
 Wasm runtime emits the following statistics:
 

diff --git a/generated_api_shadow/envoy/extensions/wasm/v3/wasm.proto b/generated_api_shadow/envoy/extensions/wasm/v3/wasm.proto
diff --git a/tools/spelling/spelling_dictionary.txt b/tools/spelling/spelling_dictionary.txt
@@ -1237,6 +1237,7 @@ virtualize
 vptr
 wakeup
 wakeups
+wamr
 wasmtime
 websocket
 wepoll
-Original file line number
+Diff line change
@@ Expand Up / @@ -1237,6 +1237,7 @@ virtualize @@
     vptr
     wakeup
     wakeups
+    wamr
     wasmtime
     websocket
     wepoll
@@ Expand Down @@