Skip to content

Commit 5076c46

Browse files
authored
Update xeus-cpp-lite to use emsdk 3.1.73 (#246)
1 parent ba37f4f commit 5076c46

File tree

4 files changed

+14
-33
lines changed

4 files changed

+14
-33
lines changed

.github/workflows/main.yml

+8-26
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,9 @@ jobs:
199199
matrix:
200200
include:
201201
- name: ubu24
202-
os: ubuntu-24.04-arm
203-
emsdk_ver: "3.1.45"
204-
micromamba_shell_init: bash
202+
os: ubuntu-24.04
205203
- name: osx15-arm
206204
os: macos-15
207-
emsdk_ver: "3.1.45"
208-
micromamba_shell_init: bash
209205

210206
steps:
211207
- uses: actions/checkout@v4
@@ -215,8 +211,9 @@ jobs:
215211
- name: install mamba
216212
uses: mamba-org/setup-micromamba@main
217213
with:
218-
init-shell: >-
219-
${{ matrix.micromamba_shell_init }}
214+
environment-file: environment-wasm-build.yml
215+
init-shell: bash
216+
environment-name: xeus-cpp-wasm-build
220217

221218
- name: Setup default Build Type on *nux
222219
if: ${{ runner.os != 'windows' }}
@@ -227,34 +224,19 @@ jobs:
227224
else
228225
echo "ncpus=$(nproc --all)" >> $GITHUB_ENV
229226
fi
230-
231-
- name: Setup default Build Type on Windows
232-
if: ${{ runner.os == 'windows' }}
233-
run: |
234-
$env:ncpus=$([Environment]::ProcessorCount)
235-
echo "ncpus=$env:ncpus" >> $env:GITHUB_ENV
236-
237-
- name: Setup emsdk
238-
shell: bash -l {0}
239-
run: |
240-
cd $HOME
241-
git clone --depth=1 https://github.com/emscripten-core/emsdk.git
242-
cd emsdk
243-
./emsdk install ${{ matrix.emsdk_ver }}
244227
245228
- name: Build xeus-cpp
246229
shell: bash -l {0}
247230
run: |
248-
$HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
249-
source $HOME/emsdk/emsdk_env.sh
250231
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
251232
252233
mkdir build
253234
pushd build
254235
255-
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
236+
export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
237+
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
256238
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
257-
export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot
239+
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
258240
259241
emcmake cmake \
260242
-DCMAKE_BUILD_TYPE=Release \
@@ -263,7 +245,7 @@ jobs:
263245
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
264246
-DSYSROOT_PATH=$SYSROOT_PATH \
265247
..
266-
emmake make -j ${{ env.ncpus }} install
248+
emmake make -j ${{ env.ncpus }} install
267249
268250
- name: Jupyter Lite integration
269251
shell: bash -l {0}

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin
8181
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
8282
mkdir build
8383
cd build
84-
export BUILD_TOOLS_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
84+
export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
8585
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
86-
export SYSROOT_PATH=$BUILD_TOOLS_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
86+
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
8787

8888
emcmake cmake \
8989
-DCMAKE_BUILD_TYPE=Release \

environment-wasm-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: xeus-cpp-wasm-build
22
channels:
3-
- https://repo.mamba.pm/emscripten-forge
3+
- https://repo.prefix.dev/emscripten-forge-dev
44
- conda-forge
55
dependencies:
66
- cmake
7-
- emscripten_emscripten-wasm32==3.1.45
7+
- emscripten_emscripten-wasm32==3.1.73

environment-wasm-host.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
name: xeus-cpp-wasm-host
22
channels:
3-
- https://repo.mamba.pm/emscripten-forge
3+
- https://repo.prefix.dev/emscripten-forge-dev
44
- https://repo.mamba.pm/conda-forge
55
dependencies:
6-
- emscripten-abi==3.1.45
76
- nlohmann_json
87
- xeus-lite
98
- xeus
109
- CppInterOp>=1.5.0
1110
- cpp-argparse
12-
- pugixml
11+
- pugixml

0 commit comments

Comments
 (0)