Skip to content

Commit 7a90748

Browse files
Update Emscripten build workflow and actions
Based on numpy/numpy#25894. This comment updates versions for Pyodide, Emscripten, and improves some names for job steps. Multiple reusable actions have also been updated in accordance with the latest versions available. Co-Authored-By: Lars Grüter <[email protected]>
1 parent 929dbcf commit 7a90748

File tree

1 file changed

+25
-18
lines changed

1 file changed

+25
-18
lines changed

.github/workflows/emscripten.yml

+25-18
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
# Copied from NumPy https://github.com/numpy/numpy/pull/24603
2-
# https://github.com/numpy/numpy/blob/328a9a488c3a146497be704d2cee2f9134e43b5b/.github/workflows/emscripten.yml
1+
# Copied from NumPy https://github.com/numpy/numpy/pull/25894
2+
# https://github.com/numpy/numpy/blob/d2d2c25fa81b47810f5cbd85ea6485eb3a3ffec3/.github/workflows/emscripten.yml
33
#
4-
# To enable this workflow on a fork, comment out:
5-
#
6-
# if: github.repository == 'scikit-image/scikit-image'
4+
75
name: Test Emscripten/Pyodide build
86

97
on:
108
pull_request:
119
branches:
1210
- main
1311
- maintenance/**
12+
# TODO: remove after ready to merge
13+
push:
14+
# branches:
15+
# - main
16+
# - maintenance/**
17+
workflow_dispatch:
1418

1519
concurrency:
1620
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -21,41 +25,44 @@ permissions:
2125

2226
jobs:
2327
build-wasm-emscripten:
28+
name: Build scikit-image distribution for Pyodide
2429
runs-on: ubuntu-22.04
25-
if: "github.repository == 'scikit-image/scikit-image'"
30+
# To enable this workflow on a fork, comment out:
31+
# if: github.repository == 'scikit-image/scikit-image'
2632
env:
27-
PYODIDE_VERSION: 0.25.0a2
33+
PYODIDE_VERSION: 0.25.0
2834
# PYTHON_VERSION and EMSCRIPTEN_VERSION are determined by PYODIDE_VERSION.
2935
# The appropriate versions can be found in the Pyodide repodata.json
3036
# "info" field, or in Makefile.envs:
3137
# https://github.com/pyodide/pyodide/blob/main/Makefile.envs#L2
3238
PYTHON_VERSION: 3.11.3
33-
EMSCRIPTEN_VERSION: 3.1.45
39+
EMSCRIPTEN_VERSION: 3.1.46
3440
NODE_VERSION: 18
3541
steps:
3642
- name: Checkout scikit-image
37-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
43+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3844

39-
- name: set up python
45+
- name: Set up Python ${{ env.PYTHON_VERSION }}
4046
id: setup-python
41-
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
47+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
4248
with:
4349
python-version: ${{ env.PYTHON_VERSION }}
4450

45-
- uses: mymindstorm/setup-emsdk@ab889da2abbcbb280f91ec4c215d3bb4f3a8f775 # v12
51+
- name: Set up Emscripten toolchain
52+
uses: mymindstorm/setup-emsdk@6ab9eb1bda2574c4ddb79809fc9247783eaf9021 # v14
4653
with:
4754
version: ${{ env.EMSCRIPTEN_VERSION }}
4855
actions-cache-folder: emsdk-cache
4956

5057
- name: Install pyodide-build
51-
run: pip install "pydantic<2" build pyodide-build==$PYODIDE_VERSION
58+
run: pip install "pydantic<2" pyodide-build==${{ env.PYODIDE_VERSION }}
5259

53-
- name: Build
60+
- name: Build scikit-image for Pyodide
5461
run: |
5562
pyodide build
5663
57-
- name: set up node
58-
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
64+
- name: Set up Node.js
65+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
5966
with:
6067
node-version: ${{ env.NODE_VERSION }}
6168

@@ -64,9 +71,9 @@ jobs:
6471
pyodide venv .venv-pyodide
6572
source .venv-pyodide/bin/activate
6673
pip install dist/*.whl
67-
python -c "import sys; print(sys.platform)"
6874
pip install matplotlib>=3.5 numpydoc>=1.5 pooch>=1.6.0 pytest>=7.0 pytest-cov>=2.11.0 pytest-localserver pytest-faulthandler
69-
- name: Test
75+
76+
- name: Test scikit-image for Pyodide
7077
run: |
7178
source .venv-pyodide/bin/activate
7279
cd ..

0 commit comments

Comments
 (0)