From 363a0418cbdc6bb034efc2f8398444247ee285f6 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Jul 2024 22:23:45 +0900 Subject: [PATCH 1/5] Revert "CI: disable armhf full job as well" This reverts commit aff7163451cce0eafad7b503403bdd5bd73fe0de. --- .github/workflows/ci.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69153095..2566ddf4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -291,21 +291,21 @@ 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-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 @@ -708,10 +708,10 @@ 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: From 33968a5db0d5e968579b10401dfaa0c93f8f4d1e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Jul 2024 22:23:54 +0900 Subject: [PATCH 2/5] Revert "README.md: update CI status" This reverts commit 9364c137742cb29e2d6897f640791b5a2648bf51. --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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. From 81e1dfa484edd3980ca8ce2f8048c5db66696eda Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Jul 2024 22:24:00 +0900 Subject: [PATCH 3/5] Revert "CI: disable armhf" This reverts commit 58ca08012a58aa4bc48a169211f1eadf9df31a95. --- .github/workflows/ci.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2566ddf4..c589f40c 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-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-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 @@ -683,10 +683,10 @@ 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: From 7150afd59fee0158a1149d31361118fb88dcbd79 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Jul 2024 22:24:11 +0900 Subject: [PATCH 4/5] Revert "CI: disable s390x jobs" This reverts commit 254bf1a1e5875115fab8d805444191bfe7963f82. --- .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 c589f40c..f818d7cb 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-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-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 @@ -306,22 +306,22 @@ jobs: 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-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 @@ -688,10 +688,10 @@ jobs: 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: @@ -713,10 +713,10 @@ jobs: 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: From 144ab5d9c7349412635f128e0071c1c15488ad8c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Jul 2024 22:24:20 +0900 Subject: [PATCH 5/5] 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 f818d7cb..273d8617 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