From d37afa3da7cb9a6d6520e3449113e339763f3a5e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 19 Jul 2023 20:55:48 +0900 Subject: [PATCH] Revert "ci: build test dyld" This reverts commit 0af1335733e2f4d9c000acef2b0d8a4185b64baa. when i made this change, i didn't want to enable both of dyld and threads in a configuration. i have changed my mind since then. enabling them together in a configuration doesn't necessarily mean that an embedder actually uses them together. i will make it full- assets instead. --- .github/workflows/ci.yml | 136 --------------------------------------- 1 file changed, 136 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ec3cd34..aa147a62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,6 @@ jobs: MISC_FEATURES: [ON, OFF] TOYWASM_ENABLE_WASM_THREADS: [ON, OFF] TOYWASM_ENABLE_WASI_THREADS: [ON, OFF] - TOYWASM_ENABLE_DYLD: [OFF] exclude: # I haven't used gcc for macos - os: macos-latest @@ -261,105 +260,6 @@ jobs: TOYWASM_ENABLE_WASM_THREADS: ON TOYWASM_ENABLE_WASI_THREADS: ON - # "dyld" = "full" - threads + dyld - - name: dyld-macos-11.0 - os: macos-latest - compiler: clang - arch: native - 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: OFF - TOYWASM_ENABLE_WASI_THREADS: OFF - TOYWASM_ENABLE_DYLD: ON - - name: dyld-ubuntu-20.04-amd64 - os: ubuntu-20.04 - compiler: clang - arch: native - 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: OFF - TOYWASM_ENABLE_WASI_THREADS: OFF - TOYWASM_ENABLE_DYLD: ON - - name: dyld-ubuntu-20.04-i386 - os: ubuntu-20.04 - compiler: clang - arch: i386 - 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: OFF - TOYWASM_ENABLE_WASI_THREADS: OFF - TOYWASM_ENABLE_DYLD: ON - - name: dyld-ubuntu-20.04-arm64 - os: ubuntu-20.04 - compiler: clang - arch: arm64 - 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: OFF - TOYWASM_ENABLE_WASI_THREADS: OFF - TOYWASM_ENABLE_DYLD: ON - - name: dyld-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 - TOYWASM_ENABLE_WASM_THREADS: OFF - TOYWASM_ENABLE_WASI_THREADS: OFF - TOYWASM_ENABLE_DYLD: ON - - name: dyld-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: OFF - TOYWASM_ENABLE_WASI_THREADS: OFF - TOYWASM_ENABLE_DYLD: ON - - name: dyld-ubuntu-20.04-riscv64 - os: ubuntu-20.04 - compiler: clang - arch: riscv64 - 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: OFF - TOYWASM_ENABLE_WASI_THREADS: OFF - TOYWASM_ENABLE_DYLD: ON - runs-on: ${{matrix.os}} steps: @@ -383,7 +283,6 @@ jobs: echo "-DTOYWASM_ENABLE_WASM_TAILCALL=${{matrix.MISC_FEATURES}}" >> ${GITHUB_ENV} echo "-DTOYWASM_ENABLE_WASM_THREADS=${{matrix.TOYWASM_ENABLE_WASM_THREADS}}" >> ${GITHUB_ENV} echo "-DTOYWASM_ENABLE_WASI_THREADS=${{matrix.TOYWASM_ENABLE_WASI_THREADS}}" >> ${GITHUB_ENV} - echo "-DTOYWASM_ENABLE_DYLD=${{matrix.TOYWASM_ENABLE_DYLD}}" >> ${GITHUB_ENV} echo "EOF" >> ${GITHUB_ENV} - name: Install dependencies (ubuntu) @@ -685,41 +584,6 @@ jobs: name: full-wasm32-wasi path: release_assets - - uses: actions/download-artifact@v3 - with: - name: dyld-macos-11.0 - path: release_assets - - - uses: actions/download-artifact@v3 - with: - name: dyld-ubuntu-20.04-amd64 - path: release_assets - - - uses: actions/download-artifact@v3 - with: - name: dyld-ubuntu-20.04-i386 - path: release_assets - - - uses: actions/download-artifact@v3 - with: - name: dyld-ubuntu-20.04-arm64 - path: release_assets - - - uses: actions/download-artifact@v3 - with: - name: dyld-ubuntu-20.04-armhf - path: release_assets - - - uses: actions/download-artifact@v3 - with: - name: dyld-ubuntu-20.04-s390x - path: release_assets - - - uses: actions/download-artifact@v3 - with: - name: dyld-ubuntu-20.04-riscv64 - path: release_assets - - name: Snapshot release if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: marvinpinto/action-automatic-releases@v1.2.1