Skip to content

Commit 6117076

Browse files
authored
Fix check-xeus-cpp command (#406)
1 parent f622f5f commit 6117076

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

.github/workflows/deploy-github-page.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ jobs:
5656
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
5757
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
5858
59+
micromamba create -n node-env -c conda-forge nodejs=22
60+
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
61+
5962
emcmake cmake \
6063
-DCMAKE_BUILD_TYPE=Release \
6164
-DCMAKE_INSTALL_PREFIX=$PREFIX \
6265
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
6366
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
6467
-DSYSROOT_PATH=$SYSROOT_PATH \
65-
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
68+
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
6669
..
6770
68-
micromamba create -n node-env -c conda-forge nodejs=22
69-
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
70-
71-
make check-xeus-cpp
71+
emmake make check-xeus-cpp -j ${{ env.ncpus }}
7272
emmake make -j ${{ env.ncpus }} install
7373
7474
- name: Test Emscripten xeus-cpp in browser
@@ -123,7 +123,7 @@ jobs:
123123
cd ./chrome/opt/google/chrome/
124124
export PATH="$PWD:$PATH"
125125
cd -
126-
126+
127127
# Install Firefox
128128
wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz
129129
tar -xJf firefox-138.0.1.tar.xz

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,19 @@ jobs:
228228
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
229229
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
230230
231+
micromamba create -n node-env -c conda-forge nodejs=22
232+
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
233+
231234
emcmake cmake \
232235
-DCMAKE_BUILD_TYPE=Release \
233236
-DCMAKE_INSTALL_PREFIX=$PREFIX \
234237
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
235238
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
236239
-DSYSROOT_PATH=$SYSROOT_PATH \
237-
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
240+
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
238241
..
239242
240-
micromamba create -n node-env -c conda-forge nodejs=22
241-
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
242-
243-
make check-xeus-cpp
243+
emmake make check-xeus-cpp -j ${{ env.ncpus }}
244244
emmake make -j ${{ env.ncpus }} install
245245
246246
- name: Test Emscripten xeus-cpp in browser
@@ -300,7 +300,7 @@ jobs:
300300
cd ./chrome/opt/google/chrome/
301301
export PATH="$PWD:$PATH"
302302
cd -
303-
303+
304304
# Install Firefox
305305
wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz
306306
tar -xJf firefox-138.0.1.tar.xz

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
8484
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
8585
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
8686

87+
micromamba create -n node-env -c conda-forge nodejs=22
88+
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
89+
8790
emcmake cmake \
8891
-DCMAKE_BUILD_TYPE=Release \
8992
-DCMAKE_INSTALL_PREFIX=$PREFIX \
@@ -92,10 +95,7 @@ emcmake cmake \
9295
-DSYSROOT_PATH=$SYSROOT_PATH \
9396
..
9497

95-
micromamba create -n node-env -c conda-forge nodejs=22
96-
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
97-
98-
make check-xeus-cpp
98+
emmake make check-xeus-cpp
9999
emmake make install
100100
```
101101

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
9999
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
100100
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
101101

102+
micromamba create -n node-env -c conda-forge nodejs=22
103+
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
104+
102105
emcmake cmake \
103106
-DCMAKE_BUILD_TYPE=Release \
104107
-DCMAKE_INSTALL_PREFIX=$PREFIX \
@@ -107,10 +110,7 @@ emcmake cmake \
107110
-DSYSROOT_PATH=$SYSROOT_PATH \
108111
..
109112

110-
micromamba create -n node-env -c conda-forge nodejs=22
111-
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
112-
113-
make check-xeus-cpp
113+
emmake make check-xeus-cpp
114114
emmake make install
115115
```
116116

docs/source/InstallationAndUsage.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in
7979
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
8080
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
8181
82+
micromamba create -n node-env -c conda-forge nodejs=22
83+
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
84+
8285
emcmake cmake \
8386
-DCMAKE_BUILD_TYPE=Release \
8487
-DCMAKE_INSTALL_PREFIX=$PREFIX \
@@ -87,10 +90,7 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in
8790
-DSYSROOT_PATH=$SYSROOT_PATH \
8891
..
8992
90-
micromamba create -n node-env -c conda-forge nodejs=22
91-
export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH"
92-
93-
make check-xeus-cpp
93+
emmake make check-xeus-cpp
9494
emmake make install
9595
9696
It is possible to run the Emscripten tests in a headless browser. We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this for Chrome and Firefox on MacOS execute the following

0 commit comments

Comments
 (0)