File tree Expand file tree Collapse file tree 5 files changed +26
-28
lines changed Expand file tree Collapse file tree 5 files changed +26
-28
lines changed Original file line number Diff line number Diff line change @@ -150,31 +150,19 @@ jobs:
150150
151151 strategy :
152152 fail-fast : false
153- matrix :
154- emsdk_ver : ["3.1.45"]
155153
156154 steps :
157155 - uses : actions/checkout@v4
158156
159- - name : Install micromamba
160- uses : mamba-org/setup-micromamba@v1
157+ - name : install mamba
158+ uses : mamba-org/setup-micromamba@main
161159 with :
162160 environment-file : environment-wasm-build.yml
163-
164- - name : Setup emsdk
165- shell : bash -l {0}
166- run : |
167- cd $HOME
168- git clone https://github.com/emscripten-core/emsdk.git
169- cd emsdk
170- ./emsdk install ${{ matrix.emsdk_ver }}
171- ./emsdk activate ${{ matrix.emsdk_ver }}
161+ init-shell : bash
172162
173163 - name : Build and pack xeus-python
164+ shell : bash -l {0}
174165 run : |
175- $HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
176- source $HOME/emsdk/emsdk_env.sh
177-
178166 micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
179167
180168 mkdir build
@@ -188,6 +176,8 @@ jobs:
188176 rm -f $PREFIX/bin/python*
189177
190178 emcmake cmake \
179+ -DCMAKE_PREFIX_PATH=$PREFIX \
180+ -DCMAKE_INSTALL_PREFIX=$PREFIX \
191181 -DCMAKE_BUILD_TYPE=Release \
192182 -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
193183 -DXPYT_EMSCRIPTEN_WASM_BUILD=ON \
Original file line number Diff line number Diff line change 5454
5555# JS artifacts
5656node_modules /
57+
58+ post.js.in
Original file line number Diff line number Diff line change @@ -378,11 +378,14 @@ endif()
378378if (EMSCRIPTEN)
379379 # TODO MAKE BETTER
380380 SET (PYTHON_UTIL_LIBS
381- $ENV{PREFIX} /lib/libbz2.a
382- $ENV{PREFIX} /lib/libz.a
383- $ENV{PREFIX} /lib/libsqlite3.a
384- $ENV{PREFIX} /lib/libffi.a
385- $ENV{PREFIX} /lib/libzstd.a
381+ ${CMAKE_INSTALL_PREFIX} /lib/libbz2.a
382+ ${CMAKE_INSTALL_PREFIX} /lib/libz.a
383+ ${CMAKE_INSTALL_PREFIX} /lib/libsqlite3.a
384+ ${CMAKE_INSTALL_PREFIX} /lib/libffi.a
385+ ${CMAKE_INSTALL_PREFIX} /lib/libzstd.a
386+ ${CMAKE_INSTALL_PREFIX} /lib/libssl.a
387+ ${CMAKE_INSTALL_PREFIX} /lib/libcrypto.a
388+ ${CMAKE_INSTALL_PREFIX} /lib/liblzma.a
386389 )
387390
388391 add_executable (xpython ${XPYTHON_WASM_SRC} )
Original file line number Diff line number Diff line change 11name : xeus-python-wasm-build
22channels :
3+ - https://repo.prefix.dev/emscripten-forge-dev
34 - conda-forge
45dependencies :
56 - cmake
7+ - emscripten_emscripten-wasm32==3.1.73
68 - pip
7- - python=3.11
9+ - python=3.13
810 - yarn
9- - click
11+ - click
Original file line number Diff line number Diff line change 11name : xeus-python-wasm-host
22channels :
3- - https://repo.mamba.pm /emscripten-forge
4- - https://repo.mamba.pm /conda-forge
3+ - https://repo.prefix.dev /emscripten-forge-dev
4+ - https://repo.prefix.dev /conda-forge
55dependencies :
66 - ipython
77 - pybind11
@@ -10,9 +10,10 @@ dependencies:
1010 - pybind11_json
1111 - numpy
1212 - xeus-lite
13- - xeus
13+ - xeus
1414 - xeus-python-shell>=0.6.3
15- - pyjs>=2.0.0
16- - requests-wasm-polyfill>=0.3.0
15+ - pyjs >=2,<3
1716 - libpython
1817 - zstd
18+ - openssl
19+ - xz
You can’t perform that action at this time.
0 commit comments