Skip to content

Commit

Permalink
Merge branch 'main' into loongarch64
Browse files Browse the repository at this point in the history
  • Loading branch information
xdoardo authored Oct 21, 2024
2 parents c73b8f1 + 7db446f commit 2983132
Show file tree
Hide file tree
Showing 44 changed files with 532 additions and 235 deletions.
289 changes: 271 additions & 18 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

51 changes: 30 additions & 21 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ jobs:

},
{
build: macos-arm64,
build: macos-arm,
os: macos-14,
target: aarch64-apple-darwin,
exe: '',
Expand All @@ -522,6 +522,11 @@ jobs:
# For now, disable LLVM in `windows-x64.`
# llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-windows-amd64.tar.xz'
},
{
build: windows-gnu,
target: x86_64-pc-windows-gnu,
os: ubuntu-22.04,
},
{
build: linux-musl,
target: x86_64-unknown-linux-musl,
Expand Down Expand Up @@ -673,7 +678,7 @@ jobs:
CARGO_TARGET: ${{ matrix.metadata.target }}
- name: Test C-API
shell: bash
if: ${{ matrix.build-what.key == 'capi' && !(matrix.metadata.build == 'linux-musl' || matrix.metadata.build == 'macos-arm' || matrix.metadata.build == 'windows-gnu') }}
if: ${{ matrix.build-what.key == 'capi' && !(matrix.metadata.build == 'linux-musl' || matrix.metadata.build == 'windows-gnu') }}
run: make test-capi-ci
env:
TARGET: ${{ matrix.metadata.target }}
Expand All @@ -682,7 +687,7 @@ jobs:
# C-API tests were disabled for linux-musl and macos-arm (we can't run them)
- name: Test C-API integration
shell: bash
if: ${{ matrix.build-what.key == 'capi' && !(matrix.metadata.build == 'linux-musl' || matrix.metadata.build == 'macos-arm' || matrix.metadata.build == 'windows-gnu') }}
if: ${{ matrix.build-what.key == 'capi' && !(matrix.metadata.build == 'linux-musl' || matrix.metadata.build == 'windows-gnu') }}
run: export WASMER_DIR=`pwd`/package && make test-stage-7-capi-integration-tests
env:
TARGET: ${{ matrix.metadata.target }}
Expand Down Expand Up @@ -754,7 +759,7 @@ jobs:

},
{
build: macos-arm64,
build: macos-arm,
os: macos-14,
target: aarch64-apple-darwin,
exe: '',
Expand Down Expand Up @@ -885,7 +890,7 @@ jobs:
os: macos-12
target: x86_64-apple-darwin
# we only build the integration-test CLI, we don't run tests
- build: macos-arm64
- build: macos-arm
os: macos-12
target: aarch64-apple-darwin,
- build: linux-musl
Expand Down Expand Up @@ -955,7 +960,7 @@ jobs:
path: package/cache/wasmercache2
- uses: actions/download-artifact@v4
with:
name: capi-macos-arm64
name: capi-macos-arm
path: package/cache/wasmercache3
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -994,9 +999,9 @@ jobs:
name: capi-linux-musl
path: download_link
- uses: actions/download-artifact@v4
if: ${{ matrix.build == 'macos-arm64' }}
if: ${{ matrix.build == 'macos-arm' }}
with:
name: capi-macos-arm64
name: capi-macos-arm
path: download_link
- uses: actions/download-artifact@v4
if: ${{ matrix.build == 'macos-x64' }}
Expand All @@ -1020,19 +1025,23 @@ jobs:
shell: bash
run: |
make untar-wasmer
- name: Test integration CLI
if: false # matrix.build != 'macos-arm'
shell: bash
run: |
export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}
export WASMER_DIR=`pwd`/package && make test-integration-cli-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 }}

# Removed in favour of freestanding integration tests
#
# - name: Test integration CLI
# if: false # matrix.build != 'macos-arm'
# shell: bash
# run: |
# export WASMER_PATH=`pwd`/target/${{ matrix.target }}/release/wasmer${{ matrix.exe }}
# export WASMER_DIR=`pwd`/package && make test-integration-cli-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 }}
# ----
# Note (xdoardo on 2024/10/07):
# ---
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wasmer-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ jobs:
wasmer login ${{ secrets.WAPM_PROD_TOKEN }} &&\
wasmer config set registry.url https://registry.wasmer.wtf/graphql &&\
wasmer login ${{ secrets.WAPM_DEV_TOKEN }} &&\
cargo test --no-fail-fast"
cargo test --no-fail-fast"
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,39 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C

## **Unreleased**

## 5.0.0-rc.1 - 21/10/2024

This is a release candidate as we are preparing for the final release of 5.0

## Added

- [#5154](https://github.com/wasmerio/wasmer/pull/5154) Add build steps for interpreter backends
- [#5138](https://github.com/wasmerio/wasmer/pull/5138) Experimental: Add support for v8
- [#5129](https://github.com/wasmerio/wasmer/pull/5129) Experimental: Add support for WASMI
- [#4515](https://github.com/wasmerio/wasmer/pull/4515) Experimental: Add interpreter support for Wasmer

## Changed

- [#5158](https://github.com/wasmerio/wasmer/pull/5158) path_create_directory shouldn't behave recursively
- [#5156](https://github.com/wasmerio/wasmer/pull/5156) Resolve double-free error in c-api
- [#5149](https://github.com/wasmerio/wasmer/pull/5149) Merge 5.0 release candidate into main
- [#5148](https://github.com/wasmerio/wasmer/pull/5148) Remove deprecated methods and types
- [#5147](https://github.com/wasmerio/wasmer/pull/5147) Feat(compiler/llvm): Replace runtime assertions (in debug mode) with errors
- [#5146](https://github.com/wasmerio/wasmer/pull/5146) feat(api/build/v8): Use blob to build v8
- [#5142](https://github.com/wasmerio/wasmer/pull/5142) Upgrade `rkyv`
- [#5098](https://github.com/wasmerio/wasmer/pull/5098) `js::module`: leave warning comment on the `Send` impl
- [#5139](https://github.com/wasmerio/wasmer/pull/5139) deps: Update corosensei
- [#5136](https://github.com/wasmerio/wasmer/pull/5136) Replace v3 usage of download-artifact
- [#5135](https://github.com/wasmerio/wasmer/pull/5135) Use upload/download artifact v4

## Fixed

- [#4834](https://github.com/wasmerio/wasmer/pull/4834) Fix `path_open` trailing slash edge case
- [#4821](https://github.com/wasmerio/wasmer/pull/4821) Fix `path_open` sometimes ignoring trailing slash
- [#5137](https://github.com/wasmerio/wasmer/pull/5137) Trying to fix js build



## 4.4.0 - 04/10/2024

This release adds support for object size estimation, adds better proxy support, improves executable spawning, and contains various bug fixes.
Expand Down
Loading

0 comments on commit 2983132

Please sign in to comment.