Merge branch 'master' into as_engine_ref_deserialize

wasmerio · Dec 22, 2022 · 47e7f5d · 47e7f5d
2 parents 66f840d + c1b8f20
commit 47e7f5d
Show file tree

Hide file tree

Showing 63 changed files with 4,636 additions and 550 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -213,9 +213,6 @@ jobs:
      #  shell: bash
      #  run: |
      #    make build-wasmer-wasm
-      - name: Build Wapm binary
-        run: |
-          make build-wapm
       - name: Install Nightly Rust for Headless
         uses: dtolnay/rust-toolchain@nightly
         with:

diff --git a/.github/workflows/cloudcompiler.yaml b/.github/workflows/cloudcompiler.yaml
@@ -35,7 +35,7 @@ jobs:
           make build-wasmer-wasm &&
           mkdir target/wasm32-wasi/release/cloudcompiler
           cp target/wasm32-wasi/release/wasmer-compiler.wasm target/wasm32-wasi/release/cloudcompiler/cloudcompiler.wasm &&
-          cat << EOF > target/wasm32-wasi/release/cloudcompiler/wapm.toml
+          cat << EOF > target/wasm32-wasi/release/cloudcompiler/wasmer.toml
           [package]
           name = "${{ secrets.WAPM_DEV_USERNAME }}/cloudcompiler"
           version = "0.1.0"
@@ -55,17 +55,17 @@ jobs:
           name = "cloudcompiler"
           module = "cloudcompiler"
           EOF
-      - name: Fix wapm.toml version
+      - name: Fix wasmer.toml version
         run: |
           echo $(git tag | tail -n1) > ./version.txt
           v=$(git describe --tags --abbrev=0) && \
           echo "version = ${v}" &&
-          sed -i "s/version = \".*\"/version = \"${v}\"/g" target/wasm32-wasi/release/cloudcompiler/wapm.toml \
+          sed -i "s/version = \".*\"/version = \"${v}\"/g" target/wasm32-wasi/release/cloudcompiler/wasmer.toml \
       - name: Build cloudcompiler.wasm
         shell: bash
         run: |
           git tag &&
-          cat target/wasm32-wasi/release/cloudcompiler/wapm.toml &&
+          cat target/wasm32-wasi/release/cloudcompiler/wasmer.toml &&
           echo "ls" && 
           ls target/wasm32-wasi/release/cloudcompiler
       - name: Publish to WAPM

diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,8 @@ api-docs-repo/
 /src/windows-installer/WasmerInstaller.exe
 /lib/c-api/wasmer.h
 .xwin-cache
+wapm.toml
+wasmer.toml
 # Generated by tests on Android
 /avd
 /core

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C
 
 ## **Unreleased**
 
+## Fixed
+
+  - [#3439](https://github.com/wasmerio/wasmer/pull/3439) Use GNU/Linux frame registration code for FreeBSD too
+
 ## 3.1.0 - 12/12/2022
 
 ## Added