Skip to content

Commit 97720c2

Browse files
committed
Update xeus-cpp-lite to use emsdk 3.1.73
1 parent ba37f4f commit 97720c2

File tree

4 files changed

+11
-28
lines changed

4 files changed

+11
-28
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,10 @@ jobs:
199199
matrix:
200200
include:
201201
- name: ubu24
202-
os: ubuntu-24.04-arm
203-
emsdk_ver: "3.1.45"
202+
os: ubuntu-24.04
204203
micromamba_shell_init: bash
205204
- name: osx15-arm
206205
os: macos-15
207-
emsdk_ver: "3.1.45"
208206
micromamba_shell_init: bash
209207

210208
steps:
@@ -227,34 +225,19 @@ jobs:
227225
else
228226
echo "ncpus=$(nproc --all)" >> $GITHUB_ENV
229227
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 }}
244228
245229
- name: Build xeus-cpp
246230
shell: bash -l {0}
247231
run: |
248-
$HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
249-
source $HOME/emsdk/emsdk_env.sh
250232
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
251233
252234
mkdir build
253235
pushd build
254236
255-
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
237+
export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
238+
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
256239
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
257-
export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot
240+
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
258241
259242
emcmake cmake \
260243
-DCMAKE_BUILD_TYPE=Release \
@@ -263,7 +246,7 @@ jobs:
263246
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
264247
-DSYSROOT_PATH=$SYSROOT_PATH \
265248
..
266-
emmake make -j ${{ env.ncpus }} install
249+
emmake make -j ${{ env.ncpus }} install
267250
268251
- name: Jupyter Lite integration
269252
shell: bash -l {0}

README.md

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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
6+
- emscripten-abi==3.1.73
77
- nlohmann_json
88
- xeus-lite
99
- xeus

0 commit comments

Comments
 (0)