diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69153095..273d8617 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -214,36 +214,36 @@ jobs: TOYWASM_ENABLE_WASI_THREADS: OFF TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: OFF - #- name: ubuntu-20.04-armhf - # os: ubuntu-20.04 - # compiler: clang - # arch: armhf - # BUILD_TYPE: Release - # TOYWASM_USE_SEPARATE_EXECUTE: ON - # TOYWASM_USE_TAILCALL: ON - # TOYWASM_ENABLE_TRACING: OFF - # TOYWASM_USE_SMALL_CELLS: ON - # TOYWASM_USE_SEPARATE_LOCALS: ON - # MISC_FEATURES: OFF - # TOYWASM_ENABLE_WASM_THREADS: OFF - # TOYWASM_ENABLE_WASI_THREADS: OFF - # TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF - # TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: OFF - #- name: ubuntu-20.04-s390x - # os: ubuntu-20.04 - # compiler: clang - # arch: s390x - # BUILD_TYPE: Release - # TOYWASM_USE_SEPARATE_EXECUTE: ON - # TOYWASM_USE_TAILCALL: ON - # TOYWASM_ENABLE_TRACING: OFF - # TOYWASM_USE_SMALL_CELLS: ON - # TOYWASM_USE_SEPARATE_LOCALS: ON - # MISC_FEATURES: OFF - # TOYWASM_ENABLE_WASM_THREADS: OFF - # TOYWASM_ENABLE_WASI_THREADS: OFF - # TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF - # TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: OFF + - name: ubuntu-20.04-armhf + os: ubuntu-20.04 + compiler: clang + arch: armhf + BUILD_TYPE: Release + TOYWASM_USE_SEPARATE_EXECUTE: ON + TOYWASM_USE_TAILCALL: ON + TOYWASM_ENABLE_TRACING: OFF + TOYWASM_USE_SMALL_CELLS: ON + TOYWASM_USE_SEPARATE_LOCALS: ON + MISC_FEATURES: OFF + TOYWASM_ENABLE_WASM_THREADS: OFF + TOYWASM_ENABLE_WASI_THREADS: OFF + TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF + TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: OFF + - name: ubuntu-20.04-s390x + os: ubuntu-20.04 + compiler: clang + arch: s390x + BUILD_TYPE: Release + TOYWASM_USE_SEPARATE_EXECUTE: ON + TOYWASM_USE_TAILCALL: ON + TOYWASM_ENABLE_TRACING: OFF + TOYWASM_USE_SMALL_CELLS: ON + TOYWASM_USE_SEPARATE_LOCALS: ON + MISC_FEATURES: OFF + TOYWASM_ENABLE_WASM_THREADS: OFF + TOYWASM_ENABLE_WASI_THREADS: OFF + TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF + TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: OFF - name: ubuntu-20.04-riscv64 os: ubuntu-20.04 compiler: clang @@ -291,37 +291,37 @@ jobs: TOYWASM_ENABLE_WASI_THREADS: ON TOYWASM_ENABLE_WASI_LITTLEFS: ON TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON - #- name: full-ubuntu-20.04-armhf - # os: ubuntu-20.04 - # compiler: clang - # arch: armhf - # BUILD_TYPE: Release - # TOYWASM_USE_SEPARATE_EXECUTE: ON - # TOYWASM_USE_TAILCALL: ON - # TOYWASM_ENABLE_TRACING: OFF - # TOYWASM_USE_SMALL_CELLS: ON - # TOYWASM_USE_SEPARATE_LOCALS: ON - # MISC_FEATURES: ON - # TOYWASM_ENABLE_WASM_THREADS: ON - # TOYWASM_ENABLE_WASI_THREADS: ON - # TOYWASM_ENABLE_WASI_LITTLEFS: ON - # TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON - #- name: full-ubuntu-20.04-s390x - # os: ubuntu-20.04 - # compiler: clang - # arch: s390x - # BUILD_TYPE: Release - # TOYWASM_USE_SEPARATE_EXECUTE: ON - # TOYWASM_USE_TAILCALL: ON - # TOYWASM_ENABLE_TRACING: OFF - # TOYWASM_USE_SMALL_CELLS: ON - # TOYWASM_USE_SEPARATE_LOCALS: ON - # MISC_FEATURES: ON - # TOYWASM_ENABLE_WASM_THREADS: ON - # TOYWASM_ENABLE_WASI_THREADS: ON - # TOYWASM_ENABLE_WASI_LITTLEFS: ON - # TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON - # TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: ON + - name: full-ubuntu-20.04-armhf + os: ubuntu-20.04 + compiler: clang + arch: armhf + BUILD_TYPE: Release + TOYWASM_USE_SEPARATE_EXECUTE: ON + TOYWASM_USE_TAILCALL: ON + TOYWASM_ENABLE_TRACING: OFF + TOYWASM_USE_SMALL_CELLS: ON + TOYWASM_USE_SEPARATE_LOCALS: ON + MISC_FEATURES: ON + TOYWASM_ENABLE_WASM_THREADS: ON + TOYWASM_ENABLE_WASI_THREADS: ON + TOYWASM_ENABLE_WASI_LITTLEFS: ON + TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON + - name: full-ubuntu-20.04-s390x + os: ubuntu-20.04 + compiler: clang + arch: s390x + BUILD_TYPE: Release + TOYWASM_USE_SEPARATE_EXECUTE: ON + TOYWASM_USE_TAILCALL: ON + TOYWASM_ENABLE_TRACING: OFF + TOYWASM_USE_SMALL_CELLS: ON + TOYWASM_USE_SEPARATE_LOCALS: ON + MISC_FEATURES: ON + TOYWASM_ENABLE_WASM_THREADS: ON + TOYWASM_ENABLE_WASI_THREADS: ON + TOYWASM_ENABLE_WASI_LITTLEFS: ON + TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON + TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: ON - name: full-ubuntu-20.04-riscv64 os: ubuntu-20.04 compiler: clang @@ -447,7 +447,12 @@ jobs: - name: Install QEMU if: matrix.arch != 'native' && matrix.arch != 'i386' + # install newer qemu from + # https://launchpad.net/%7Ecanonical-server/+archive/ubuntu/server-backports/ + # https://github.com/yamt/toywasm/pull/53#issuecomment-1605899935 run: | + sudo apt-get update && sudo apt-get install -y software-properties-common + sudo add-apt-repository -y ppa:canonical-server/server-backports sudo apt-get update && sudo apt-get install -y qemu-user-static - name: toywasm --version @@ -683,15 +688,15 @@ jobs: name: ubuntu-20.04-arm64 path: release_assets - #- uses: actions/download-artifact@v3 - # with: - # name: ubuntu-20.04-armhf - # path: release_assets + - uses: actions/download-artifact@v3 + with: + name: ubuntu-20.04-armhf + path: release_assets - #- uses: actions/download-artifact@v3 - # with: - # name: ubuntu-20.04-s390x - # path: release_assets + - uses: actions/download-artifact@v3 + with: + name: ubuntu-20.04-s390x + path: release_assets - uses: actions/download-artifact@v3 with: @@ -708,15 +713,15 @@ jobs: name: full-ubuntu-20.04-arm64 path: release_assets - #- uses: actions/download-artifact@v3 - # with: - # name: full-ubuntu-20.04-armhf - # path: release_assets + - uses: actions/download-artifact@v3 + with: + name: full-ubuntu-20.04-armhf + path: release_assets - #- uses: actions/download-artifact@v3 - # with: - # name: full-ubuntu-20.04-s390x - # path: release_assets + - uses: actions/download-artifact@v3 + with: + name: full-ubuntu-20.04-s390x + path: release_assets - uses: actions/download-artifact@v3 with: diff --git a/README.md b/README.md index 315d3faa..81c83ef3 100644 --- a/README.md +++ b/README.md @@ -72,8 +72,8 @@ It includes |Ubuntu/amd64 |Yes | | |Ubuntu/i386 |Yes |32-bit, smaller alignment | |Ubuntu/arm64 |Yes (on qemu) | | -|Ubuntu/armhf |[Disabled] |32-bit | -|Ubuntu/s390x |[Disabled] |Big endian | +|Ubuntu/armhf |Yes (on qemu) |32-bit | +|Ubuntu/s390x |Yes (on qemu) |Big endian | |Ubuntu/riscv64 |Yes (on qemu) | | |Windows/X64 |Yes |Core wasm only | |wasm32-wasi-threads |No |Occasionally tested manually | @@ -81,8 +81,6 @@ It includes |NuttX/sim on macOS/amd64|No |Occasionally tested manually | |NetBSD/amd64 |No |Occasionally tested manually | -[Disabled]: https://github.com/yamt/toywasm/pull/238#issuecomment-2226868990 - ## Use as a command See toywasm command help message.