Skip to content

Commit 3928328

Browse files
committed
Use script from pyodide-recipes to install and patch emsdk
1 parent d24117e commit 3928328

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

.github/workflows/build-packages.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ on:
66
description: Version Tag (Usually YYYYMMDD)
77
required: true
88
default: ""
9-
emsdk_version:
10-
description: Version of emsdk to use
11-
required: true
12-
default: "4.0.9"
139
pyodide_tag:
1410
description: Branch or tag of pyodide/pyodide-recipes to get recipes from
1511
required: true
@@ -31,7 +27,6 @@ jobs:
3127

3228
- name: Install dependencies
3329
env:
34-
EMSDK_VERSION: ${{ inputs.emsdk_version }}
3530
PYODIDE_VERSION: ${{ inputs.pyodide_version }}
3631
PYODIDE_TAG: ${{ inputs.pyodide_tag }}
3732
run: |

packages/setup.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
#!/bin/bash
22

3-
git clone https://github.com/emscripten-core/emsdk
4-
cd emsdk
5-
./emsdk install $EMSDK_VERSION
6-
./emsdk activate $EMSDK_VERSION
7-
source ./emsdk_env.sh
8-
cd ..
9-
103
git clone https://github.com/pyodide/pyodide-recipes.git
114
(cd pyodide-recipes && git checkout $PYODIDE_TAG)
5+
126
ln -s pyodide-recipes/packages packages
137

148
# rust is required for building some wheels
@@ -24,3 +18,4 @@ source .venv/bin/activate
2418
pip install pyodide-build
2519

2620
pip install boto3 cython requests
21+
python pyodide-recipes/tools/install_and_patch_emscripten.py

0 commit comments

Comments
 (0)