From 673e759ab005c8097cc765234269b57412088f0c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 15 Apr 2025 23:25:34 +0900 Subject: [PATCH 1/3] CI: enable armhf --- .github/workflows/ci.yml | 76 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0aba7589..aa114cf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -214,21 +214,21 @@ jobs: TOYWASM_ENABLE_WASI_THREADS: OFF TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: OFF - #- name: ubuntu-22.04-armhf - # os: ubuntu-22.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-22.04-armhf + os: ubuntu-22.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-22.04-s390x # os: ubuntu-22.04 # compiler: clang @@ -291,21 +291,21 @@ jobs: TOYWASM_ENABLE_WASI_THREADS: ON TOYWASM_ENABLE_WASI_LITTLEFS: ON TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON - #- name: full-ubuntu-22.04-armhf - # os: ubuntu-22.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-22.04-armhf + os: ubuntu-22.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-22.04-s390x # os: ubuntu-22.04 # compiler: clang @@ -683,10 +683,10 @@ jobs: name: ubuntu-22.04-arm64 path: release_assets - #- uses: actions/download-artifact@v4 - # with: - # name: ubuntu-22.04-armhf - # path: release_assets + - uses: actions/download-artifact@v4 + with: + name: ubuntu-22.04-armhf + path: release_assets #- uses: actions/download-artifact@v4 # with: @@ -708,10 +708,10 @@ jobs: name: full-ubuntu-22.04-arm64 path: release_assets - #- uses: actions/download-artifact@v4 - # with: - # name: full-ubuntu-22.04-armhf - # path: release_assets + - uses: actions/download-artifact@v4 + with: + name: full-ubuntu-22.04-armhf + path: release_assets #- uses: actions/download-artifact@v4 # with: From bde5110d82f87c23d0b3d710fbd875a559725615 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 15 Apr 2025 23:26:58 +0900 Subject: [PATCH 2/3] CI: enable s390x --- .github/workflows/ci.yml | 78 ++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa114cf7..6c70b096 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -229,21 +229,21 @@ jobs: TOYWASM_ENABLE_WASI_THREADS: OFF TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: OFF TOYWASM_ENABLE_WASM_CUSTOM_PAGE_SIZES: OFF - #- name: ubuntu-22.04-s390x - # os: ubuntu-22.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-22.04-s390x + os: ubuntu-22.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-22.04-riscv64 os: ubuntu-22.04 compiler: clang @@ -306,22 +306,22 @@ jobs: TOYWASM_ENABLE_WASI_THREADS: ON TOYWASM_ENABLE_WASI_LITTLEFS: ON TOYWASM_ENABLE_WASM_EXCEPTION_HANDLING: ON - #- name: full-ubuntu-22.04-s390x - # os: ubuntu-22.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-22.04-s390x + os: ubuntu-22.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-22.04-riscv64 os: ubuntu-22.04 compiler: clang @@ -688,10 +688,10 @@ jobs: name: ubuntu-22.04-armhf path: release_assets - #- uses: actions/download-artifact@v4 - # with: - # name: ubuntu-22.04-s390x - # path: release_assets + - uses: actions/download-artifact@v4 + with: + name: ubuntu-22.04-s390x + path: release_assets - uses: actions/download-artifact@v4 with: @@ -713,10 +713,10 @@ jobs: name: full-ubuntu-22.04-armhf path: release_assets - #- uses: actions/download-artifact@v4 - # with: - # name: full-ubuntu-22.04-s390x - # path: release_assets + - uses: actions/download-artifact@v4 + with: + name: full-ubuntu-22.04-s390x + path: release_assets - uses: actions/download-artifact@v4 with: From 8584041810bde1b50e0afa53a6d457a174398dce Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 16 Apr 2025 00:04:21 +0900 Subject: [PATCH 3/3] Reapply "ci: try installing qemu 7.0 from canonical server backports" This reverts commit 89cc28e0e0edb949df6873673220317e4fb5d375. --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c70b096..a7d62b64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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