From 28fde38db21887c725111a6fd86742a3a33cd9ad Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Sat, 7 Jan 2023 18:55:08 -0800 Subject: [PATCH] move wasm wheel to default PR checks --- .github/workflows/build_wheel.yml | 29 ++++++++++++++++++++- .github/workflows/build_wheel_all_archs.yml | 29 +-------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index c156659b33..d3a17a73e4 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -55,11 +55,38 @@ jobs: with: path: './wheelhouse/sourmash*.whl' + build_wasm: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: 3.10.2 + - run: | + pip install 'pyodide-build>=0.22.0' + pyodide config get emscripten_version # trigger setup + echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV + - uses: mymindstorm/setup-emsdk@v11 + with: + version: ${{ env.EMSCRIPTEN_VERSION }} + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + target: wasm32-unknown-emscripten + - run: | + export RUSTC_BOOTSTRAP=1 + pyodide build + + - uses: actions/upload-artifact@v3 + with: + path: './dist/sourmash*.whl' + + release: name: Publish wheels runs-on: ubuntu-20.04 if: startsWith(github.ref, 'refs/tags/v') - needs: build_wheels + needs: [build_wheels, build_wasm] steps: - name: Fetch wheels from artifacts diff --git a/.github/workflows/build_wheel_all_archs.yml b/.github/workflows/build_wheel_all_archs.yml index deb51aaafc..1ed0179fde 100644 --- a/.github/workflows/build_wheel_all_archs.yml +++ b/.github/workflows/build_wheel_all_archs.yml @@ -1,7 +1,7 @@ name: cibuildwheel_ubuntu on: - pull_request: # use for testing modifications to this action + #pull_request: # use for testing modifications to this action push: branches: [latest] tags: v* @@ -77,37 +77,10 @@ jobs: with: path: './wheelhouse/sourmash*.whl' - build_wasm: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: 3.10.2 - - run: | - pip install 'pyodide-build>=0.22.0' - pyodide config get emscripten_version # trigger setup - echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV - - uses: mymindstorm/setup-emsdk@v11 - with: - version: ${{ env.EMSCRIPTEN_VERSION }} - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: wasm32-unknown-emscripten - - run: | - export RUSTC_BOOTSTRAP=1 - pyodide build - - - uses: actions/upload-artifact@v3 - with: - path: './dist/sourmash*.whl' - release: name: Publish wheels runs-on: ubuntu-20.04 if: startsWith(github.ref, 'refs/tags/v') - needs: [build_wheels, build_wasm] steps: - name: Fetch wheels from artifacts